Include wx_presets.py in the distribution made by "make dist".

[wxWidgets.git] / src / common / sizer.cpp

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index fdf018eae760f3132d2a1deb0c94b79db8ad31e2..535cae56c5bbea3a2d8e23e4f90cd7573a61b5ff 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -2568,12 +2568,9 @@ void wxStdDialogButtonSizer::Realize()
         Add(12, 40);
 #elif defined(__WXGTK20__)
         // http://library.gnome.org/devel/hig-book/stable/windows-alert.html.en
-        // describes the margins and the buttons order but basically it is
+        // says that the correct button order is
         //
         //      [Help]                  [Alternative] [Cancel] [Affirmative]
-        //
-        // in general case but, somewhat confusingly, the native message box
-        // uses "No Yes Cancel" with these particular buttons so do we as well.
 
         // Flags ensuring that margins between the buttons are 6 pixels.
         const wxSizerFlags
@@ -2585,30 +2582,20 @@ void wxStdDialogButtonSizer::Realize()
         if (m_buttonHelp)
             Add(m_buttonHelp, flagsBtn);
 
-        // extra whitespace between help and cancel/ok buttons
+        // Align the rest of the buttons to the right.
         AddStretchSpacer();
 
         if (m_buttonNegative)
             Add(m_buttonNegative, flagsBtn);
 
         if (m_buttonApply)
-        {
             Add(m_buttonApply, flagsBtn);
 
-            if (m_buttonCancel)
-                Add(m_buttonCancel, flagsBtn);
+        if (m_buttonCancel)
+            Add(m_buttonCancel, flagsBtn);
 
-            if (m_buttonAffirmative)
-                Add(m_buttonAffirmative, flagsBtn);
-        }
-        else // No [Apply]
-        {
-            if (m_buttonAffirmative)
-                Add(m_buttonAffirmative, flagsBtn);
-
-            if (m_buttonCancel)
-                Add(m_buttonCancel, flagsBtn);
-        }
+        if (m_buttonAffirmative)
+            Add(m_buttonAffirmative, flagsBtn);
 
         // Ensure that the right margin is 12 as well.
         AddSpacer(9);