X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2afba7c46ce2fbd13a6aed64e7600343fd01c224..4a21ea9d9eec67383ffba7c86f7c413ddee28114:/src/common/sizer.cpp

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 518ccce91f..89eaacb15d 100644
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -2526,6 +2526,29 @@ void wxStdDialogButtonSizer::SetCancelButton( wxButton *button )
     m_buttonCancel = button;
 }
 
+#ifdef __WXGTK20__
+
+namespace
+{
+
+// Returns true only if the button is non-NULL and has the given id and text
+// (possible translated).
+bool IsStdButtonWithStdText(wxButton *btn, wxWindowID id, const char *label)
+{
+    if ( !btn )
+        return false;
+
+    if ( btn->GetId() != id )
+        return false;
+
+    const wxString labelText = btn->GetLabelText();
+    return labelText == label || labelText == wxGetTranslation(label);
+}
+
+} // anonymous namespace
+
+#endif // __WXGTK20__
+
 void wxStdDialogButtonSizer::Realize()
 {
 #ifdef __WXMAC__
@@ -2567,46 +2590,55 @@ void wxStdDialogButtonSizer::Realize()
         // Extra space around and at the right
         Add(12, 40);
 #elif defined(__WXGTK20__)
-        Add(0, 0, 0, wxLEFT, 9);
-        if (m_buttonHelp)
-            Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
+        // http://library.gnome.org/devel/hig-book/stable/windows-alert.html.en
+        // describes the margins and the buttons order but basically it 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.
 
-        // extra whitespace between help and cancel/ok buttons
-        Add(0, 0, 1, wxEXPAND, 0);
+        // Flags ensuring that margins between the buttons are 6 pixels.
+        const wxSizerFlags
+            flagsBtn = wxSizerFlags().Centre().Border(wxLEFT | wxRIGHT, 3);
 
-        if (m_buttonNegative){
-            Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
-        }
+        // Margin around the entire sizer button should be 12.
+        AddSpacer(9);
 
-        if (m_buttonApply)
-        {
-            // according to HIG, in explicit apply windows the order is:
-            // [ Help                     Apply   Cancel   OK ]
+        if (m_buttonHelp)
+            Add(m_buttonHelp, flagsBtn);
 
-            Add((wxWindow*)m_buttonApply,
-                0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
+        // Align the rest of the buttons to the right.
+        AddStretchSpacer();
 
-            if (m_buttonCancel)
-                Add((wxWindow*)m_buttonCancel,
-                    0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
-
-            if (m_buttonAffirmative)
-                Add((wxWindow*)m_buttonAffirmative,
-                     0, wxALIGN_CENTRE | wxLEFT, 6);
+        // "No Yes Cancel" is an exception to the general rule according to
+        // which the affirmative buttons goes after "Cancel" so treat it
+        // separately
+        if ( IsStdButtonWithStdText(m_buttonNegative, wxID_NO, "No") &&
+              IsStdButtonWithStdText(m_buttonAffirmative, wxID_YES, "Yes") &&
+               IsStdButtonWithStdText(m_buttonCancel, wxID_CANCEL, "Cancel") )
+        {
+            Add(m_buttonNegative, flagsBtn);
+            Add(m_buttonAffirmative, flagsBtn);
+            Add(m_buttonCancel, flagsBtn);
         }
-        else
+        else // Use standard layout
         {
-            // without an Apply button, have the buttons representing
-            // affirmative and negative close to each other.
+            if (m_buttonNegative)
+                Add(m_buttonNegative, flagsBtn);
 
-            if (m_buttonAffirmative)
-                Add((wxWindow*)m_buttonAffirmative,
-                    0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
+            if (m_buttonApply)
+                Add(m_buttonApply, flagsBtn);
 
             if (m_buttonCancel)
-                Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT, 6);
+                Add(m_buttonCancel, flagsBtn);
+
+            if (m_buttonAffirmative)
+                Add(m_buttonAffirmative, flagsBtn);
         }
 
+        // Ensure that the right margin is 12 as well.
+        AddSpacer(9);
 #elif defined(__WXMSW__)
         // Windows