From: Václav Slavík <vslavik@fastmail.fm>
Date: Sun, 20 Feb 2011 18:18:51 +0000 (+0000)
Subject: Put normal space between Back and Next buttons in wxWizard.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9698902019ae0f6c81cd941fecb4cdace2811ea7

Put normal space between Back and Next buttons in wxWizard.

Use regular space between these two buttons even on Windows, where they
were previously close together. This used to be done in older Windows
versions, but modern Windows HIG documents show wizards with equal
spacing between all buttons and that's what Windows OS itself does. In
other words, not treating this pair of buttons specially is more native.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 1b40923001..af2cdf6274 100644
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -373,13 +373,6 @@ void wxWizard::AddBackNextPair(wxBoxSizer *buttonRow)
                   wxT("You must create the buttons before calling ")
                   wxT("wxWizard::AddBackNextPair") );
 
-    // margin between Back and Next buttons
-#ifdef __WXMAC__
-    static const int BACKNEXT_MARGIN = 10;
-#else
-    static const int BACKNEXT_MARGIN = 0;
-#endif
-
     wxBoxSizer *backNextPair = new wxBoxSizer(wxHORIZONTAL);
     buttonRow->Add(
         backNextPair,
@@ -389,7 +382,7 @@ void wxWizard::AddBackNextPair(wxBoxSizer *buttonRow)
     );
 
     backNextPair->Add(m_btnPrev);
-    backNextPair->Add(BACKNEXT_MARGIN,0,
+    backNextPair->Add(10, 0,
         0, // No horizontal stretching
         wxEXPAND // No border, (mostly useless) vertical stretching
     );