From be604faa7b2134e60a1e12d74c9c62b946a259ac Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sat, 7 Sep 2002 10:38:23 +0000
Subject: [PATCH] Fixed overlapping buttons in wizard on MacOS X

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/wizard.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index aef2a89210..0b99d25e0c 100644
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -190,6 +190,13 @@ void wxWizard::DoCreateControls()
     // margin between "Next >" and "Cancel" buttons
     static const int BUTTON_MARGIN = 10;
 
+    // margin between Back and Next buttons
+#ifdef __WXMAC__
+    static const int BACKNEXT_MARGIN = 10;
+#else
+    static const int BACKNEXT_MARGIN = 0;
+#endif
+
     // default width and height of the page
     static const int DEFAULT_PAGE_WIDTH = 270;
     static const int DEFAULT_PAGE_HEIGHT = 290;
@@ -238,7 +245,7 @@ void wxWizard::DoCreateControls()
                            wxSize(m_x + m_width - x, 2));
 #endif // wxUSE_STATLINE
 
-    x = m_x + m_width - 3*sizeBtn.x - BUTTON_MARGIN;
+    x = m_x + m_width - 3*sizeBtn.x - BUTTON_MARGIN - BACKNEXT_MARGIN;
     y += SEPARATOR_LINE_MARGIN;
 
     if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON)
@@ -254,6 +261,8 @@ void wxWizard::DoCreateControls()
     m_btnPrev = new wxButton(this, wxID_BACKWARD, _("< &Back"), wxPoint(x, y), sizeBtn);
 
     x += sizeBtn.x;
+    x += BACKNEXT_MARGIN;
+
     m_btnNext = new wxButton(this, wxID_FORWARD, _("&Next >"), wxPoint(x, y), sizeBtn);
 
     x += sizeBtn.x + BUTTON_MARGIN;
-- 
2.47.2