reactivate commented out method

[wxWidgets.git] / src / gtk / msgdlg.cpp

diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index dc24565e391852c931f817fb7ccb43a1a40c77e7..d459602f0b015e45e808ed465740d46808024ad6 100644 (file)
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -44,7 +44,7 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
                                  const wxString& caption,
                                  long style,
                                  const wxPoint& WXUNUSED(pos))
                                  const wxString& caption,
                                  long style,
                                  const wxPoint& WXUNUSED(pos))

-               : wxMessageDialogWithCustomLabels
+               : wxMessageDialogBase

                  (
                     GetParentForModalDialog(parent, style),
                     message,
                  (
                     GetParentForModalDialog(parent, style),
                     message,


@@ -79,7 +79,7 @@ void wxMessageDialog::DoSetCustomLabel(wxString& var, const ButtonLabel& label)
     int stockId = label.GetStockId();
     if ( stockId == wxID_NONE )
     {
     int stockId = label.GetStockId();
     if ( stockId == wxID_NONE )
     {

-        wxMessageDialogWithCustomLabels::DoSetCustomLabel(var, label);
+        wxMessageDialogBase::DoSetCustomLabel(var, label);

         var = wxConvertMnemonicsToGTK(var);
     }
     else // stock label
         var = wxConvertMnemonicsToGTK(var);
     }
     else // stock label


@@ -215,16 +215,23 @@ void wxMessageDialog::GTKCreateMsgDialog()
     {
         if ( addButtons )
         {
     {
         if ( addButtons )
         {

+            // Add the buttons in the correct order which is, according to
+            // http://library.gnome.org/devel/hig-book/stable/windows-alert.html.en
+            // the following one:
+            //
+            // [Help]                  [Alternative] [Cancel] [Affirmative]
+

             gtk_dialog_add_button(dlg, wxGTK_CONV(GetNoLabel()),
                                   GTK_RESPONSE_NO);
             gtk_dialog_add_button(dlg, wxGTK_CONV(GetNoLabel()),
                                   GTK_RESPONSE_NO);

-            gtk_dialog_add_button(dlg, wxGTK_CONV(GetYesLabel()),
-                                  GTK_RESPONSE_YES);

 
             if ( m_dialogStyle & wxCANCEL )
             {
                 gtk_dialog_add_button(dlg, wxGTK_CONV(GetCancelLabel()),
                                       GTK_RESPONSE_CANCEL);
             }
 
             if ( m_dialogStyle & wxCANCEL )
             {
                 gtk_dialog_add_button(dlg, wxGTK_CONV(GetCancelLabel()),
                                       GTK_RESPONSE_CANCEL);
             }

+
+            gtk_dialog_add_button(dlg, wxGTK_CONV(GetYesLabel()),
+                                  GTK_RESPONSE_YES);

         }
 
         // it'd probably be harmless to call gtk_dialog_set_default_response()
         }
 
         // it'd probably be harmless to call gtk_dialog_set_default_response()