[packages/scorched3d.git] / wxWidgets3.patch

diff -ur scorched3d-43.3d/src/launcher/wxdialogs/Display.cpp scorched3d-43.3d-wx3/src/launcher/wxdialogs/Display.cpp
--- scorched3d-43.3d/src/launcher/wxdialogs/Display.cpp	2011-10-11 00:26:43.000000000 +0200
+++ scorched3d-43.3d-wx3/src/launcher/wxdialogs/Display.cpp	2014-01-18 17:36:33.855429533 +0100
@@ -88,7 +88,7 @@
 	// Sound settings\r
 	wxStaticBox *soundBox = new wxStaticBox(parent, -1, wxT("&Sound"));\r
 	wxStaticBoxSizer *soundSizerMain = new wxStaticBoxSizer(soundBox, wxVERTICAL);\r
-	wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(4, 2);\r
+	wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(4, 2, wxSize(5, 5));\r
 	wxStaticText *volumeText = new wxStaticText(parent, -1, wxT("Sound Volume :"));\r
 	wxStaticText *musicVolumeText = new wxStaticText(parent, -1, wxT("Music Volume :"));\r
 	wxStaticText *ambientVolumeText = new wxStaticText(parent, -1, wxT("Ambient Volume :"));\r
@@ -137,7 +137,7 @@
 		wxT("Game Detail Options"));\r
 	wxStaticBoxSizer *speedSizer = new wxStaticBoxSizer(speedBox, wxHORIZONTAL);\r
 \r
-	wxGridSizer *loadSizer = new wxFlexGridSizer(2, 2);\r
+	wxGridSizer *loadSizer = new wxFlexGridSizer(2, 2, wxSize(5, 5));\r
 	IDC_LOADULTRA_CTRL = new wxButton(parent,  ID_LOADULTRA, wxT("&Ultra Detail"), wxDefaultPosition, wxSize(120,-1));\r
 	IDC_LOADDEFAULTS_CTRL = new wxButton(parent, ID_LOADDEFAULTS, wxT("&Normal Detail"), wxDefaultPosition, wxSize(120,-1));\r
 	IDC_LOADMEDIUM_CTRL = new wxButton(parent, ID_LOADMEDIUM, wxT("Faster Detail"), wxDefaultPosition, wxSize(120,-1));\r
@@ -471,7 +471,7 @@
 {\r
 	wxScrolledWindow *scrolledWindow = new wxScrolledWindow(parent, -1, \r
 		wxDefaultPosition, wxSize(480, 250));\r
-	wxSizer *sizer = new wxFlexGridSizer(5, 1);\r
+	wxSizer *sizer = new wxFlexGridSizer(5, 1, wxSize(5, 5));\r
 	\r
 	keyboardKeyList.clear();\r
 	if (!Keyboard::instance()->loadKeyFile())\r
diff -ur scorched3d-43.3d/src/launcher/wxdialogs/DisplayDialog.cpp scorched3d-43.3d-wx3/src/launcher/wxdialogs/DisplayDialog.cpp
--- scorched3d-43.3d/src/launcher/wxdialogs/DisplayDialog.cpp	2012-01-08 16:26:34.000000000 +0100
+++ scorched3d-43.3d-wx3/src/launcher/wxdialogs/DisplayDialog.cpp	2014-01-18 17:39:41.062094844 +0100
@@ -733,7 +733,7 @@
 		convertString(S3D::formatStringBuffer("%s.s3m", (const char *) (selection.mb_str(wxConvUTF8)))), // default filename\r
 		wxT(""), // default extension\r
 		wxT("*.s3m"),\r
-		wxSAVE);\r
+		wxFD_SAVE);\r
 	if (file.empty()) return;\r
 	ModFiles files;\r
 	if (!files.loadModFiles(std::string(selection.mb_str(wxConvUTF8)), false))\r
@@ -757,7 +757,7 @@
 		wxT(""), // default filename\r
 		wxT(""), // default extension\r
 		wxT("*.s3m"),\r
-		wxOPEN | wxFILE_MUST_EXIST);\r
+		wxFD_OPEN | wxFD_FILE_MUST_EXIST);\r
 	if (file.empty()) return;\r
 	ModFiles files;\r
 	std::string mod;\r
diff -ur scorched3d-43.3d/src/launcher/wxdialogs/KeyDialog.cpp scorched3d-43.3d-wx3/src/launcher/wxdialogs/KeyDialog.cpp
--- scorched3d-43.3d/src/launcher/wxdialogs/KeyDialog.cpp	2011-06-28 01:11:12.000000000 +0200
+++ scorched3d-43.3d-wx3/src/launcher/wxdialogs/KeyDialog.cpp	2014-01-18 17:41:35.702094014 +0100
@@ -107,7 +107,7 @@
 		keyDialogControlDown = event.ControlDown();\r
 		keyDialogShiftDown = event.ShiftDown();\r
 		keyDialogAltDown = event.AltDown();\r
-		keyDialogKeyCode = event.KeyCode();\r
+		keyDialogKeyCode = event.GetKeyCode();\r
 		frame_->EndModal(0);\r
 	}\r
 }\r
diff -ur scorched3d-43.3d/src/launcher/wxdialogs/SettingsDialog.cpp scorched3d-43.3d-wx3/src/launcher/wxdialogs/SettingsDialog.cpp
--- scorched3d-43.3d/src/launcher/wxdialogs/SettingsDialog.cpp	2011-09-06 01:29:53.000000000 +0200
+++ scorched3d-43.3d-wx3/src/launcher/wxdialogs/SettingsDialog.cpp	2014-01-18 17:43:23.118759904 +0100
@@ -105,7 +105,7 @@
 	mainPanel_ = new wxPanel(book_, -1);\r
 	book_->AddPage(mainPanel_, wxT("Main"));\r
 	wxSizer *mainPanelSizer = new wxBoxSizer(wxVERTICAL);\r
-	wxSizer *sizer = new wxFlexGridSizer(2, 2);\r
+	wxSizer *sizer = new wxFlexGridSizer(2, 2, wxSize(5, 5));\r
 	mainPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);\r
 \r
 	setters_.push_back(\r
@@ -166,7 +166,7 @@
 {\r
 	moneyPanel_ = new wxPanel(book_, -1);\r
 	wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);\r
-	wxSizer *sizer = new wxFlexGridSizer(2, 2);\r
+	wxSizer *sizer = new wxFlexGridSizer(2, 2, wxSize(5, 5));\r
 	ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);\r
 \r
 	setters_.push_back(\r
@@ -215,7 +215,7 @@
 {\r
 	scorePanel_ = new wxPanel(book_, -1);\r
 	wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);\r
-	wxSizer *sizer = new wxFlexGridSizer(2, 2);\r
+	wxSizer *sizer = new wxFlexGridSizer(2, 2, wxSize(5, 5));\r
 	ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);\r
 \r
 	setters_.push_back(\r
@@ -249,7 +249,7 @@
 {\r
 	weaponsPanel_ = new wxPanel(book_, -1);\r
 	wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);\r
-	wxSizer *sizer = new wxFlexGridSizer(2, 2);\r
+	wxSizer *sizer = new wxFlexGridSizer(2, 2, wxSize(5, 5));\r
 	ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);\r
 \r
 	setters_.push_back(\r
@@ -286,7 +286,7 @@
 {\r
 	envPanel_ = new wxPanel(book_, -1);\r
 	wxSizer *envPanelSizer = new wxBoxSizer(wxVERTICAL);\r
-	wxSizer *sizer = new wxFlexGridSizer(2, 2);\r
+	wxSizer *sizer = new wxFlexGridSizer(2, 2, wxSize(5, 5));\r
 	envPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);\r
 \r
 	setters_.push_back(\r
@@ -337,7 +337,7 @@
 	wxScrolledWindow *scrolledWindow = new wxScrolledWindow(landPanel_, -1, \r
 		wxDefaultPosition, wxSize(225, 200));\r
 \r
-	wxSizer *sizer = new wxFlexGridSizer(3, 3);\r
+	wxSizer *sizer = new wxFlexGridSizer(3, 3, wxSize(5, 5));\r
 	int i = 0;\r
 	std::list<LandscapeDefinitionsEntry> &defns =\r
 		landscapeDefinitions.getAllLandscapes();\r
@@ -438,7 +438,7 @@
 		wxT("Players are persistent for game"));\r
 	playersPanelSizer->Add(IDC_SERVER_RESIDUAL_CTRL, 0, wxALIGN_CENTER | wxTOP, 10);\r
 		\r
-	wxSizer *sizer = new wxGridSizer(3, 3);\r
+	wxSizer *sizer = new wxGridSizer(3, 3, wxSize(5, 5));\r
 	playersPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);\r
 \r
 	for (int i=0; i<24; i++)\r
Commit	Line	Data
60c73156 JR	1	diff -ur scorched3d-43.3d/src/launcher/wxdialogs/Display.cpp scorched3d-43.3d-wx3/src/launcher/wxdialogs/Display.cpp
	2	--- scorched3d-43.3d/src/launcher/wxdialogs/Display.cpp 2011-10-11 00:26:43.000000000 +0200
	3	+++ scorched3d-43.3d-wx3/src/launcher/wxdialogs/Display.cpp 2014-01-18 17:36:33.855429533 +0100
	4	@@ -88,7 +88,7 @@
	5	// Sound settings\r
	6	wxStaticBox *soundBox = new wxStaticBox(parent, -1, wxT("&Sound"));\r
	7	wxStaticBoxSizer *soundSizerMain = new wxStaticBoxSizer(soundBox, wxVERTICAL);\r
	8	- wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(4, 2);\r
	9	+ wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(4, 2, wxSize(5, 5));\r
	10	wxStaticText *volumeText = new wxStaticText(parent, -1, wxT("Sound Volume :"));\r
	11	wxStaticText *musicVolumeText = new wxStaticText(parent, -1, wxT("Music Volume :"));\r
	12	wxStaticText *ambientVolumeText = new wxStaticText(parent, -1, wxT("Ambient Volume :"));\r
	13	@@ -137,7 +137,7 @@
	14	wxT("Game Detail Options"));\r
	15	wxStaticBoxSizer *speedSizer = new wxStaticBoxSizer(speedBox, wxHORIZONTAL);\r
	16	\r
	17	- wxGridSizer *loadSizer = new wxFlexGridSizer(2, 2);\r
	18	+ wxGridSizer *loadSizer = new wxFlexGridSizer(2, 2, wxSize(5, 5));\r
	19	IDC_LOADULTRA_CTRL = new wxButton(parent, ID_LOADULTRA, wxT("&Ultra Detail"), wxDefaultPosition, wxSize(120,-1));\r
	20	IDC_LOADDEFAULTS_CTRL = new wxButton(parent, ID_LOADDEFAULTS, wxT("&Normal Detail"), wxDefaultPosition, wxSize(120,-1));\r
	21	IDC_LOADMEDIUM_CTRL = new wxButton(parent, ID_LOADMEDIUM, wxT("Faster Detail"), wxDefaultPosition, wxSize(120,-1));\r
	22	@@ -471,7 +471,7 @@
	23	{\r
	24	wxScrolledWindow *scrolledWindow = new wxScrolledWindow(parent, -1, \r
	25	wxDefaultPosition, wxSize(480, 250));\r
	26	- wxSizer *sizer = new wxFlexGridSizer(5, 1);\r
	27	+ wxSizer *sizer = new wxFlexGridSizer(5, 1, wxSize(5, 5));\r
	28	\r
	29	keyboardKeyList.clear();\r
	30	if (!Keyboard::instance()->loadKeyFile())\r
	31	diff -ur scorched3d-43.3d/src/launcher/wxdialogs/DisplayDialog.cpp scorched3d-43.3d-wx3/src/launcher/wxdialogs/DisplayDialog.cpp
	32	--- scorched3d-43.3d/src/launcher/wxdialogs/DisplayDialog.cpp 2012-01-08 16:26:34.000000000 +0100
	33	+++ scorched3d-43.3d-wx3/src/launcher/wxdialogs/DisplayDialog.cpp 2014-01-18 17:39:41.062094844 +0100
	34	@@ -733,7 +733,7 @@
	35	convertString(S3D::formatStringBuffer("%s.s3m", (const char *) (selection.mb_str(wxConvUTF8)))), // default filename\r
	36	wxT(""), // default extension\r
	37	wxT("*.s3m"),\r
	38	- wxSAVE);\r
	39	+ wxFD_SAVE);\r
	40	if (file.empty()) return;\r
	41	ModFiles files;\r
	42	if (!files.loadModFiles(std::string(selection.mb_str(wxConvUTF8)), false))\r
	43	@@ -757,7 +757,7 @@
	44	wxT(""), // default filename\r
	45	wxT(""), // default extension\r
	46	wxT("*.s3m"),\r
	47	- wxOPEN \| wxFILE_MUST_EXIST);\r
	48	+ wxFD_OPEN \| wxFD_FILE_MUST_EXIST);\r
	49	if (file.empty()) return;\r
	50	ModFiles files;\r
	51	std::string mod;\r
	52	diff -ur scorched3d-43.3d/src/launcher/wxdialogs/KeyDialog.cpp scorched3d-43.3d-wx3/src/launcher/wxdialogs/KeyDialog.cpp
	53	--- scorched3d-43.3d/src/launcher/wxdialogs/KeyDialog.cpp 2011-06-28 01:11:12.000000000 +0200
	54	+++ scorched3d-43.3d-wx3/src/launcher/wxdialogs/KeyDialog.cpp 2014-01-18 17:41:35.702094014 +0100
	55	@@ -107,7 +107,7 @@
	56	keyDialogControlDown = event.ControlDown();\r
	57	keyDialogShiftDown = event.ShiftDown();\r
	58	keyDialogAltDown = event.AltDown();\r
	59	- keyDialogKeyCode = event.KeyCode();\r
	60	+ keyDialogKeyCode = event.GetKeyCode();\r
	61	frame_->EndModal(0);\r
	62	}\r
	63	}\r
	64	diff -ur scorched3d-43.3d/src/launcher/wxdialogs/SettingsDialog.cpp scorched3d-43.3d-wx3/src/launcher/wxdialogs/SettingsDialog.cpp
65	--- scorched3d-43.3d/src/launcher/wxdialogs/SettingsDialog.cpp 2011-09-06 01:29:53.000000000 +0200
66	+++ scorched3d-43.3d-wx3/src/launcher/wxdialogs/SettingsDialog.cpp 2014-01-18 17:43:23.118759904 +0100
67	@@ -105,7 +105,7 @@
68	mainPanel_ = new wxPanel(book_, -1);\r
69	book_->AddPage(mainPanel_, wxT("Main"));\r
70	wxSizer *mainPanelSizer = new wxBoxSizer(wxVERTICAL);\r
71	- wxSizer *sizer = new wxFlexGridSizer(2, 2);\r
72	+ wxSizer *sizer = new wxFlexGridSizer(2, 2, wxSize(5, 5));\r
73	mainPanelSizer->Add(sizer, 0, wxALL \| wxALIGN_CENTER, 10);\r
74	\r
75	setters_.push_back(\r
76	@@ -166,7 +166,7 @@
77	{\r
78	moneyPanel_ = new wxPanel(book_, -1);\r
79	wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);\r
80	- wxSizer *sizer = new wxFlexGridSizer(2, 2);\r
81	+ wxSizer *sizer = new wxFlexGridSizer(2, 2, wxSize(5, 5));\r
82	ecoPanelSizer->Add(sizer, 0, wxALL \| wxALIGN_CENTER, 10);\r
83	\r
84	setters_.push_back(\r
85	@@ -215,7 +215,7 @@
86	{\r
87	scorePanel_ = new wxPanel(book_, -1);\r
88	wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);\r
89	- wxSizer *sizer = new wxFlexGridSizer(2, 2);\r
90	+ wxSizer *sizer = new wxFlexGridSizer(2, 2, wxSize(5, 5));\r
91	ecoPanelSizer->Add(sizer, 0, wxALL \| wxALIGN_CENTER, 10);\r
92	\r
93	setters_.push_back(\r
94	@@ -249,7 +249,7 @@
95	{\r
96	weaponsPanel_ = new wxPanel(book_, -1);\r
97	wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);\r
98	- wxSizer *sizer = new wxFlexGridSizer(2, 2);\r
99	+ wxSizer *sizer = new wxFlexGridSizer(2, 2, wxSize(5, 5));\r
100	ecoPanelSizer->Add(sizer, 0, wxALL \| wxALIGN_CENTER, 10);\r
101	\r
102	setters_.push_back(\r
103	@@ -286,7 +286,7 @@
104	{\r
105	envPanel_ = new wxPanel(book_, -1);\r
106	wxSizer *envPanelSizer = new wxBoxSizer(wxVERTICAL);\r
107	- wxSizer *sizer = new wxFlexGridSizer(2, 2);\r
108	+ wxSizer *sizer = new wxFlexGridSizer(2, 2, wxSize(5, 5));\r
109	envPanelSizer->Add(sizer, 0, wxALL \| wxALIGN_CENTER, 10);\r
110	\r
111	setters_.push_back(\r
112	@@ -337,7 +337,7 @@
113	wxScrolledWindow *scrolledWindow = new wxScrolledWindow(landPanel_, -1, \r
114	wxDefaultPosition, wxSize(225, 200));\r
115	\r
116	- wxSizer *sizer = new wxFlexGridSizer(3, 3);\r
117	+ wxSizer *sizer = new wxFlexGridSizer(3, 3, wxSize(5, 5));\r
118	int i = 0;\r
119	std::list<LandscapeDefinitionsEntry> &defns =\r
120	landscapeDefinitions.getAllLandscapes();\r
121	@@ -438,7 +438,7 @@
122	wxT("Players are persistent for game"));\r
123	playersPanelSizer->Add(IDC_SERVER_RESIDUAL_CTRL, 0, wxALIGN_CENTER \| wxTOP, 10);\r
124	\r
125	- wxSizer *sizer = new wxGridSizer(3, 3);\r
126	+ wxSizer *sizer = new wxGridSizer(3, 3, wxSize(5, 5));\r
127	playersPanelSizer->Add(sizer, 0, wxALL \| wxALIGN_CENTER, 10);\r
128	\r
129	for (int i=0; i<24; i++)\r