Fix crash in wxMSW wxProgressDialog without wxPD_APP_MODAL style.

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index fdf018eae760f3132d2a1deb0c94b79db8ad31e2..89eaacb15d9d6f592d3feefdfde2f44f8b63430b 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -2526,6 +2526,29 @@ void wxStdDialogButtonSizer::SetCancelButton( wxButton *button )
     m_buttonCancel = 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__
 void wxStdDialogButtonSizer::Realize()
 {
 #ifdef __WXMAC__


@@ -2585,15 +2608,27 @@ void wxStdDialogButtonSizer::Realize()
         if (m_buttonHelp)
             Add(m_buttonHelp, flagsBtn);
 
         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();
 
         AddStretchSpacer();
 

-        if (m_buttonNegative)
+        // "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_buttonNegative, flagsBtn);

-
-        if (m_buttonApply)
+            Add(m_buttonAffirmative, flagsBtn);
+            Add(m_buttonCancel, flagsBtn);
+        }
+        else // Use standard layout

         {
         {

-            Add(m_buttonApply, flagsBtn);
+            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);


@@ -2601,14 +2636,6 @@ void wxStdDialogButtonSizer::Realize()
             if (m_buttonAffirmative)
                 Add(m_buttonAffirmative, 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);
-        }

 
         // Ensure that the right margin is 12 as well.
         AddSpacer(9);
 
         // Ensure that the right margin is 12 as well.
         AddSpacer(9);