This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository scorched3d.
commit 9994f64e985934efeab48e8d9c5a0ed5394d58f3 Author: Markus Koschany <[email protected]> Date: Sat Jul 16 04:41:44 2016 +0200 Update wx3.0-compat.patch --- debian/patches/wx3.0-compat.patch | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/patches/wx3.0-compat.patch b/debian/patches/wx3.0-compat.patch index 7e8c36a..7ba7a13 100644 --- a/debian/patches/wx3.0-compat.patch +++ b/debian/patches/wx3.0-compat.patch @@ -6,13 +6,13 @@ Make Scorched3D compatible with wxWidgets 3.0 Thanks to Olly Betts for the patch. --- - src/launcher/wxdialogs/Display.cpp | 8 ++++---- + src/launcher/wxdialogs/Display.cpp | 10 +++++----- src/launcher/wxdialogs/DisplayDialog.cpp | 10 +++++----- src/launcher/wxdialogs/SettingsDialog.cpp | 14 +++++++------- - 3 files changed, 16 insertions(+), 16 deletions(-) + 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/launcher/wxdialogs/Display.cpp b/src/launcher/wxdialogs/Display.cpp -index e0a423a..f112a6e 100644 +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) @@ -42,6 +42,15 @@ index e0a423a..f112a6e 100644 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)); +@@ -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, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scorched3d.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
