commit 0f1aadc25e177a1238e0a1ff25cca4a81b67b835
Author: Jan Rękorajski <[email protected]>
Date: Fri Oct 6 01:39:51 2023 +0200
- uo to 44
no-static-wx.patch | 11 ++++
returntype.patch | 11 ++++
scorched3d-gcc47.patch | 11 ----
scorched3d-libpng15.patch | 87 ----------------------------
scorched3d.spec | 18 +++---
wxWidgets3.patch | 143 +++++++++++++++++++++++++++++-----------------
6 files changed, 123 insertions(+), 158 deletions(-)
---
diff --git a/scorched3d.spec b/scorched3d.spec
index 82460ef..492426f 100644
--- a/scorched3d.spec
+++ b/scorched3d.spec
@@ -1,18 +1,18 @@
Summary: A 3D version of the classic DOS game Scorched Earth
Summary(pl.UTF-8): Wersja 3D klasycznej DOS-owej gry Scorched Earth
Name: scorched3d
-Version: 43.3d
-Release: 5
+Version: 44
+Release: 1
License: GPL v2+
Group: X11/Applications/Games
Source0:
http://downloads.sourceforge.net/scorched3d/Scorched3D-%{version}-src.tar.gz
-# Source0-md5: 9c3043282a9e7451468ff325bef3b04c
+# Source0-md5: c395d54a7a43cf91166d2cc0f7dec83e
Source1: %{name}.desktop
Patch0: %{name}-types.patch
Patch1: %{name}-openal.patch
-Patch2: %{name}-libpng15.patch
-Patch3: %{name}-gcc47.patch
Patch4: wxWidgets3.patch
+Patch5: no-static-wx.patch
+Patch6: returntype.patch
URL: http://www.scorched3d.co.uk/
BuildRequires: ImageMagick-coder-png
BuildRequires: OpenAL-devel >= 0.0.8
@@ -32,7 +32,7 @@ BuildRequires: libvorbis-devel
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.533
BuildRequires: sed >= 4.0
-BuildRequires: wxGTK2-devel >= 2.6.0
+BuildRequires: wxGTK3-unicode-devel >= 2.6.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _noautoreqdep libGL.so.1 libGLU.so.1
@@ -55,9 +55,9 @@ rm -rf scorched-dep-osx scorched
%undos src/common/porting/windows.h src/common/image/ImagePngFactory.cpp
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%patch4 -p1
+%patch5 -p1
+%patch6 -p0
%build
%{__aclocal}
@@ -65,7 +65,7 @@ rm -rf scorched-dep-osx scorched
%{__automake}
%configure \
--datadir=%{_datadir}/%{name} \
- --with-wx-config=wx-gtk2-ansi-config
+ --with-wx-config=wx-gtk3-unicode-config
%{__make}
diff --git a/no-static-wx.patch b/no-static-wx.patch
new file mode 100644
index 0000000..6e1083a
--- /dev/null
+++ b/no-static-wx.patch
@@ -0,0 +1,11 @@
+--- scorched3d-43.3d/acinclude.m4~ 2008-03-03 22:17:18.000000000 +0100
++++ scorched3d-43.3d/acinclude.m4 2023-10-06 01:15:06.488368648 +0200
+@@ -317,7 +317,7 @@
+ no_wx=yes
+ else
+ WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
+- WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs`
++ WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --libs`
+
+ dnl starting with version 2.2.6 wx-config has --cppflags argument
+ wx_has_cppflags=""
diff --git a/returntype.patch b/returntype.patch
new file mode 100644
index 0000000..cd6f114
--- /dev/null
+++ b/returntype.patch
@@ -0,0 +1,11 @@
+--- src/common/weapons/AccessoryStore.cpp.orig 2016-02-13 22:16:08.997822186
-0600
++++ src/common/weapons/AccessoryStore.cpp 2016-02-13 22:16:47.949819533
-0600
+@@ -156,7 +156,7 @@
+ Accessory *parent, XMLNode *currentNode)
+ {
+ XMLNode *typeNode = 0;
+- if (!currentNode->getNamedParameter("type", typeNode)) return false;
++ if (!currentNode->getNamedParameter("type", typeNode)) return 0;
+
+ AccessoryPart *accessoryPart =
+
AccessoryMetaRegistration::getNewAccessory(typeNode->getContent(), this);
diff --git a/scorched3d-gcc47.patch b/scorched3d-gcc47.patch
deleted file mode 100644
index 570284f..0000000
--- a/scorched3d-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur scorched3d-43.3.orig/src/client/client/SecureID.cpp
scorched3d-43.3/src/client/client/SecureID.cpp
---- scorched3d-43.3.orig/src/client/client/SecureID.cpp 2010-07-20
02:28:59.000000000 +0200
-+++ scorched3d-43.3/src/client/client/SecureID.cpp 2012-11-16
13:38:27.545520369 +0100
-@@ -75,6 +75,7 @@
-
- #include <sys/ioctl.h>
- #include <net/if.h>
-+#include <unistd.h>
-
- std::string SecureID::GetPrivateKey(void)
- {
diff --git a/scorched3d-libpng15.patch b/scorched3d-libpng15.patch
deleted file mode 100644
index 6266d87..0000000
--- a/scorched3d-libpng15.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- scorched/src/common/image/ImagePngFactory.cpp~ 2010-08-07
23:27:04.000000000 +0200
-+++ scorched/src/common/image/ImagePngFactory.cpp 2012-02-12
12:56:58.330929507 +0100
-@@ -104,7 +104,7 @@
-
- static void user_png_error(png_structp png_ptr, png_const_charp msg)
- {
-- longjmp(png_ptr->jmpbuf,1);
-+ longjmp(png_jmpbuf(png_ptr),1);
- }
-
- static void user_png_warning(png_structp png_ptr, png_const_charp msg)
---- scorched/src/client/client/LoadPNG.cpp~ 2010-08-16 01:26:36.000000000
+0200
-+++ scorched/src/client/client/LoadPNG.cpp 2012-02-12 12:51:20.395625495
+0100
-@@ -12,7 +12,7 @@
-
- SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *src)
- {
-- int start;
-+ int start, num_palette;
- const char *error;
- SDL_Surface *volatile surface;
- png_structp png_ptr;
-@@ -28,6 +28,7 @@
- int row, i;
- volatile int ckey = -1;
- png_color_16 *transv;
-+ png_colorp png_palette;
-
- if ( !src ) {
- /* The error message has been set in SDL_RWFromFile */
-@@ -58,7 +59,7 @@
- * the normal method of doing things with libpng). REQUIRED unless you
- * set up your own error handlers in png_create_read_struct() earlier.
- */
-- if ( setjmp(png_ptr->jmpbuf) ) {
-+ if ( setjmp(png_jmpbuf(png_ptr)) ) {
- error = "Error reading the PNG file.";
- goto done;
- }
-@@ -127,9 +128,9 @@
- Rmask = 0x000000FF;
- Gmask = 0x0000FF00;
- Bmask = 0x00FF0000;
-- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+ Amask = (png_get_channels(png_ptr, info_ptr) == 4) ?
0xFF000000 : 0;
- } else {
-- int s = (info_ptr->channels == 4) ? 0 : 8;
-+ int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0
: 8;
- Rmask = 0xFF000000 >> s;
- Gmask = 0x00FF0000 >> s;
- Bmask = 0x0000FF00 >> s;
-@@ -137,7 +138,7 @@
- }
- }
- surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
-- bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
-+ bit_depth*png_get_channels(png_ptr, info_ptr),
Rmask,Gmask,Bmask,Amask);
- if ( surface == NULL ) {
- error = "Out of memory";
- goto done;
-@@ -177,6 +178,7 @@
-
- /* Load the palette, if any */
- palette = surface->format->palette;
-+ png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette);
- if ( palette ) {
- if(color_type == PNG_COLOR_TYPE_GRAY) {
- palette->ncolors = 256;
-@@ -185,12 +187,12 @@
- palette->colors[i].g = i;
- palette->colors[i].b = i;
- }
-- } else if (info_ptr->num_palette > 0 ) {
-- palette->ncolors = info_ptr->num_palette;
-- for( i=0; i<info_ptr->num_palette; ++i ) {
-- palette->colors[i].b = info_ptr->palette[i].blue;
-- palette->colors[i].g = info_ptr->palette[i].green;
-- palette->colors[i].r = info_ptr->palette[i].red;
-+ } else if (num_palette > 0 ) {
-+ palette->ncolors = num_palette;
-+ for( i=0; i<num_palette; ++i ) {
-+ palette->colors[i].b = png_palette[i].blue;
-+ palette->colors[i].g = png_palette[i].green;
-+ palette->colors[i].r = png_palette[i].red;
- }
- }
- }
diff --git a/wxWidgets3.patch b/wxWidgets3.patch
index 52567e2..7ba7a13 100644
--- a/wxWidgets3.patch
+++ b/wxWidgets3.patch
@@ -1,129 +1,170 @@
-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 @@
+From: Markus Koschany <[email protected]>
+Date: Fri, 15 Jul 2016 18:01:36 +0200
+Subject: wx3.0 compat
+
+Make Scorched3D compatible with wxWidgets 3.0
+
+Thanks to Olly Betts for the patch.
+---
+ src/launcher/wxdialogs/Display.cpp | 10 +++++-----
+ src/launcher/wxdialogs/DisplayDialog.cpp | 10 +++++-----
+ src/launcher/wxdialogs/SettingsDialog.cpp | 14 +++++++-------
+ 3 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/launcher/wxdialogs/Display.cpp
b/src/launcher/wxdialogs/Display.cpp
+index e0a423a..22169e0 100644
+--- a/src/launcher/wxdialogs/Display.cpp
++++ b/src/launcher/wxdialogs/Display.cpp
+@@ -26,7 +26,7 @@ static void createMainControls(wxWindow *parent, wxSizer
*sizer)
+ // Display settings
+ wxStaticBox *displayBox = new wxStaticBox(parent, -1, wxT("&Display"));
+ wxStaticBoxSizer *displaySizer = new wxStaticBoxSizer(displayBox,
wxVERTICAL);
+- wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(2, 3, 5, 5);
++ wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(0, 3, 5, 5);
+ wxStaticText *resText = new wxStaticText(parent, -1, wxT("&Resolution
:"));
+ IDC_DISPLAY_CTRL =
+ new wxComboBox(parent, -1,
+@@ -88,7 +88,7 @@ static void createMainControls(wxWindow *parent, wxSizer
*sizer)
// Sound settings
wxStaticBox *soundBox = new wxStaticBox(parent, -1, wxT("&Sound"));
wxStaticBoxSizer *soundSizerMain = new wxStaticBoxSizer(soundBox,
wxVERTICAL);
- wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(4, 2);
-+ wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(4, 2, wxSize(5, 5));
++ wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(0, 4, 2, 0);
wxStaticText *volumeText = new wxStaticText(parent, -1, wxT("Sound
Volume :"));
wxStaticText *musicVolumeText = new wxStaticText(parent, -1, wxT("Music
Volume :"));
wxStaticText *ambientVolumeText = new wxStaticText(parent, -1,
wxT("Ambient Volume :"));
-@@ -137,7 +137,7 @@
+@@ -137,7 +137,7 @@ static void createMainControls(wxWindow *parent, wxSizer
*sizer)
wxT("Game Detail Options"));
wxStaticBoxSizer *speedSizer = new wxStaticBoxSizer(speedBox,
wxHORIZONTAL);
- wxGridSizer *loadSizer = new wxFlexGridSizer(2, 2);
-+ wxGridSizer *loadSizer = new wxFlexGridSizer(2, 2, wxSize(5, 5));
++ wxGridSizer *loadSizer = new wxFlexGridSizer(0, 2, 2, 0);
IDC_LOADULTRA_CTRL = new wxButton(parent, ID_LOADULTRA, wxT("&Ultra
Detail"), wxDefaultPosition, wxSize(120,-1));
IDC_LOADDEFAULTS_CTRL = new wxButton(parent, ID_LOADDEFAULTS,
wxT("&Normal Detail"), wxDefaultPosition, wxSize(120,-1));
IDC_LOADMEDIUM_CTRL = new wxButton(parent, ID_LOADMEDIUM, wxT("Faster
Detail"), wxDefaultPosition, wxSize(120,-1));
-@@ -471,7 +471,7 @@
+@@ -256,7 +256,7 @@ static void createSpeedControls(wxWindow *parent, wxSizer
*sizer)
+ wxStaticBox *waterDetailBox = new wxStaticBox(parent, -1,
+
wxT("Graphics Detail"));
+ wxStaticBoxSizer *waterDetailSizer = new
wxStaticBoxSizer(waterDetailBox, wxHORIZONTAL);
+- wxGridSizer *waterDetailSizer2 = new wxGridSizer(3, 1, 10, 10);
++ wxGridSizer *waterDetailSizer2 = new wxGridSizer(0, 1, 10, 10);
+
+ IDC_NOWATERREF_CTRL =
+ new wxCheckBox(parent, -1, wxT("Don't draw water reflections -
Large Framerate Improvement"));
+@@ -471,7 +471,7 @@ static void createKeysControls(wxWindow *parent, wxSizer
*topsizer)
{
wxScrolledWindow *scrolledWindow = new wxScrolledWindow(parent, -1,
wxDefaultPosition, wxSize(480, 250));
- wxSizer *sizer = new wxFlexGridSizer(5, 1);
-+ wxSizer *sizer = new wxFlexGridSizer(5, 1, wxSize(5, 5));
++ wxSizer *sizer = new wxFlexGridSizer(0, 5, 1, 0);
keyboardKeyList.clear();
if (!Keyboard::instance()->loadKeyFile())
-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
- wxT(""), // default extension
- wxT("*.s3m"),
+diff --git a/src/launcher/wxdialogs/DisplayDialog.cpp
b/src/launcher/wxdialogs/DisplayDialog.cpp
+index c34c9dc..0cdc620 100644
+--- a/src/launcher/wxdialogs/DisplayDialog.cpp
++++ b/src/launcher/wxdialogs/DisplayDialog.cpp
+@@ -449,15 +449,15 @@ void DisplayFrame::refreshScreen()
+ IDC_SLIDER1_CTRL->SetValue(OptionsDisplay::instance()->getBrightness());
+
IDC_SLIDER1_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getBrightnessEntry().getDescription(),
wxConvUTF8));
+ IDC_VOLUME_CTRL->SetRange(0, 128);
+- IDC_VOLUME_CTRL->SetTickFreq(4, 0);
++ IDC_VOLUME_CTRL->SetTickFreq(4);
+ IDC_VOLUME_CTRL->SetValue(OptionsDisplay::instance()->getSoundVolume());
+
IDC_VOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getSoundVolumeEntry().getDescription(),
wxConvUTF8));
+ IDC_MUSICVOLUME_CTRL->SetRange(0, 128);
+- IDC_MUSICVOLUME_CTRL->SetTickFreq(4, 0);
++ IDC_MUSICVOLUME_CTRL->SetTickFreq(4);
+
IDC_MUSICVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getMusicVolume());
+
IDC_MUSICVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getMusicVolumeEntry().getDescription(),
wxConvUTF8));
+ IDC_AMBIENTVOLUME_CTRL->SetRange(0, 128);
+- IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4, 0);
++ IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4);
+
IDC_AMBIENTVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getAmbientSoundVolume());
+
IDC_AMBIENTVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getAmbientSoundVolumeEntry().getDescription(),
wxConvUTF8));
+
IDC_USERNAME_CTRL->SetValue(wxString(OptionsDisplay::instance()->getOnlineUserName(),
wxConvUTF8));
+@@ -736,7 +736,7 @@ void DisplayFrame::onExportMod(wxCommandEvent &event)
+ #if wxCHECK_VERSION(2, 8, 0)
+ wxFD_SAVE);
+ #else
- wxSAVE);
+ wxFD_SAVE);
+ #endif
if (file.empty()) return;
ModFiles files;
- if (!files.loadModFiles(std::string(selection.mb_str(wxConvUTF8)),
false))
-@@ -757,7 +757,7 @@
- wxT(""), // default filename
- wxT(""), // default extension
- wxT("*.s3m"),
+@@ -764,7 +764,7 @@ void DisplayFrame::onImportMod(wxCommandEvent &event)
+ #if wxCHECK_VERSION(2, 8, 0)
+ wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+ #else
- wxOPEN | wxFILE_MUST_EXIST);
+ wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+ #endif
if (file.empty()) return;
ModFiles files;
- std::string mod;
-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();
- keyDialogShiftDown = event.ShiftDown();
- keyDialogAltDown = event.AltDown();
-- keyDialogKeyCode = event.KeyCode();
-+ keyDialogKeyCode = event.GetKeyCode();
- frame_->EndModal(0);
- }
- }
-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 @@
+diff --git a/src/launcher/wxdialogs/SettingsDialog.cpp
b/src/launcher/wxdialogs/SettingsDialog.cpp
+index b312085..03ba629 100644
+--- a/src/launcher/wxdialogs/SettingsDialog.cpp
++++ b/src/launcher/wxdialogs/SettingsDialog.cpp
+@@ -105,7 +105,7 @@ void SettingsFrame::createMainPanel(bool server)
mainPanel_ = new wxPanel(book_, -1);
book_->AddPage(mainPanel_, wxT("Main"));
wxSizer *mainPanelSizer = new wxBoxSizer(wxVERTICAL);
- wxSizer *sizer = new wxFlexGridSizer(2, 2);
-+ wxSizer *sizer = new wxFlexGridSizer(2, 2, wxSize(5, 5));
++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
mainPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
setters_.push_back(
-@@ -166,7 +166,7 @@
+@@ -166,7 +166,7 @@ void SettingsFrame::createMoneyPanel()
{
moneyPanel_ = new wxPanel(book_, -1);
wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
- wxSizer *sizer = new wxFlexGridSizer(2, 2);
-+ wxSizer *sizer = new wxFlexGridSizer(2, 2, wxSize(5, 5));
++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
setters_.push_back(
-@@ -215,7 +215,7 @@
+@@ -215,7 +215,7 @@ void SettingsFrame::createScorePanel()
{
scorePanel_ = new wxPanel(book_, -1);
wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
- wxSizer *sizer = new wxFlexGridSizer(2, 2);
-+ wxSizer *sizer = new wxFlexGridSizer(2, 2, wxSize(5, 5));
++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
setters_.push_back(
-@@ -249,7 +249,7 @@
+@@ -249,7 +249,7 @@ void SettingsFrame::createWeaponsPanel()
{
weaponsPanel_ = new wxPanel(book_, -1);
wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
- wxSizer *sizer = new wxFlexGridSizer(2, 2);
-+ wxSizer *sizer = new wxFlexGridSizer(2, 2, wxSize(5, 5));
++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
setters_.push_back(
-@@ -286,7 +286,7 @@
+@@ -286,7 +286,7 @@ void SettingsFrame::createEnvPanel()
{
envPanel_ = new wxPanel(book_, -1);
wxSizer *envPanelSizer = new wxBoxSizer(wxVERTICAL);
- wxSizer *sizer = new wxFlexGridSizer(2, 2);
-+ wxSizer *sizer = new wxFlexGridSizer(2, 2, wxSize(5, 5));
++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
envPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
setters_.push_back(
-@@ -337,7 +337,7 @@
+@@ -337,7 +337,7 @@ void SettingsFrame::createLandPanel()
wxScrolledWindow *scrolledWindow = new wxScrolledWindow(landPanel_, -1,
wxDefaultPosition, wxSize(225, 200));
- wxSizer *sizer = new wxFlexGridSizer(3, 3);
-+ wxSizer *sizer = new wxFlexGridSizer(3, 3, wxSize(5, 5));
++ wxSizer *sizer = new wxFlexGridSizer(0, 3, 3, 0);
int i = 0;
std::list<LandscapeDefinitionsEntry> &defns =
landscapeDefinitions.getAllLandscapes();
-@@ -438,7 +438,7 @@
+@@ -438,7 +438,7 @@ void SettingsFrame::createPlayersPanel()
wxT("Players are persistent for game"));
playersPanelSizer->Add(IDC_SERVER_RESIDUAL_CTRL, 0, wxALIGN_CENTER |
wxTOP, 10);
- wxSizer *sizer = new wxGridSizer(3, 3);
-+ wxSizer *sizer = new wxGridSizer(3, 3, wxSize(5, 5));
++ wxSizer *sizer = new wxGridSizer(0, 3, 3, 0);
playersPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
for (int i=0; i<24; i++)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/scorched3d.git/commitdiff/0f1aadc25e177a1238e0a1ff25cca4a81b67b835
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
