summaryrefslogtreecommitdiff
blob: 0e71268fcfa575b0c33821845f557809f4e5d635 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
diff -urN scorched.orig/configure scorched/configure
--- scorched.orig/configure	2006-07-15 11:15:30.000000000 -0400
+++ scorched/configure	2006-08-02 17:05:08.000000000 -0400
@@ -5159,7 +5159,7 @@
 # Check for extra functions
 
 
-for ac_func in vsnprintf snprintf
+for ac_func in vsnprintf snprintf vasprintf asprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
diff -urN scorched.orig/src/scorched/NetLan.cpp scorched/src/scorched/NetLan.cpp
--- scorched.orig/src/scorched/NetLan.cpp	2006-07-05 13:16:14.000000000 -0400
+++ scorched/src/scorched/NetLan.cpp	2006-08-02 17:05:08.000000000 -0400
@@ -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 -urN scorched.orig/src/scorched/OptionEntrySetter.cpp scorched/src/scorched/OptionEntrySetter.cpp
--- scorched.orig/src/scorched/OptionEntrySetter.cpp	2006-07-11 10:35:32.000000000 -0400
+++ scorched/src/scorched/OptionEntrySetter.cpp	2006-08-02 17:05:08.000000000 -0400
@@ -122,7 +122,7 @@
 		{
 			sizer->Add(control = 
 				new wxCheckBox(parent, -1,
-					"",
+					wxT(""),
 					wxDefaultPosition, wxDefaultSize),
 					0, wxALIGN_LEFT);
 			control->SetToolTip(