r1225 - packages/trunk/scorched3d/debian/patches

[Reinhard Tartler]

Author: siretart-guest
Date: 2006-07-27 14:04:29 +0000 (Thu, 27 Jul 2006)
New Revision: 1225

Added:
   packages/trunk/scorched3d/debian/patches/06_wx-wxT-breakage.dpatch
Modified:
   packages/trunk/scorched3d/debian/patches/00list
Log:
fix some breakage wrt newer wxwidgets version


Modified: packages/trunk/scorched3d/debian/patches/00list
===================================================================
--- packages/trunk/scorched3d/debian/patches/00list	2006-07-27 10:38:58 UTC (rev 1224)
+++ packages/trunk/scorched3d/debian/patches/00list	2006-07-27 14:04:29 UTC (rev 1225)
@@ -4,3 +4,4 @@
 03_netserver
 04_alut-linkage
 05_formatstring
+06_wx-wxT-breakage
\ No newline at end of file

Added: packages/trunk/scorched3d/debian/patches/06_wx-wxT-breakage.dpatch
===================================================================
--- packages/trunk/scorched3d/debian/patches/06_wx-wxT-breakage.dpatch	2006-07-27 10:38:58 UTC (rev 1224)
+++ packages/trunk/scorched3d/debian/patches/06_wx-wxT-breakage.dpatch	2006-07-27 14:04:29 UTC (rev 1225)
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_wx-wxT-breakage.dpatch by Reinhard Tartler <siretart at tauware.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: current wxWidgets2.6 requires strings casted like this. 
+## DP: Patch stolen from cvs HEAD
+
+ at DPATCH@
+diff -urNad scorched3d~/src/scorched/NetLan.cpp scorched3d/src/scorched/NetLan.cpp
+--- scorched3d~/src/scorched/NetLan.cpp	2006-07-27 10:28:09.000000000 +0200
++++ scorched3d/src/scorched/NetLan.cpp	2006-07-27 15:55:10.000000000 +0200
+@@ -96,9 +96,9 @@
+ 	// Radio Buttons
+ 	wxFlexGridSizer *radioSizer = new wxFlexGridSizer(1, 8, 5, 5);
+ 	IDC_RADIO_NET_CTRL = new wxRadioButton(parent, IDC_RADIO_NET, 
+-		"Internet", wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
++		wxT("Internet"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
+ 	IDC_RADIO_LAN_CTRL = new wxRadioButton(parent, IDC_RADIO_LAN, 
+-		"LAN", wxDefaultPosition, wxDefaultSize, 0);
++		wxT("LAN"), wxDefaultPosition, wxDefaultSize, 0);
+ 	radioSizer->Add(IDC_RADIO_NET_CTRL, 0, wxRIGHT, 10);
+ 	radioSizer->Add(IDC_RADIO_LAN_CTRL, 0, wxRIGHT, 0);
+ 	sizer->Add(radioSizer, 0, wxALIGN_CENTER | wxALL, 5);
+diff -urNad scorched3d~/src/scorched/OptionEntrySetter.cpp scorched3d/src/scorched/OptionEntrySetter.cpp
+--- scorched3d~/src/scorched/OptionEntrySetter.cpp	2006-07-26 17:05:18.000000000 +0200
++++ scorched3d/src/scorched/OptionEntrySetter.cpp	2006-07-27 15:55:22.000000000 +0200
+@@ -122,7 +122,7 @@
+ 		{
+ 			sizer->Add(control = 
+ 				new wxCheckBox(parent, -1,
+-					"",
++					wxT(""),
+ 					wxDefaultPosition, wxDefaultSize),
+ 					0, wxALIGN_LEFT);
+ 			control->SetToolTip(


Property changes on: packages/trunk/scorched3d/debian/patches/06_wx-wxT-breakage.dpatch
___________________________________________________________________
Name: svn:executable
   + *