fix wxGTK1 compilation after wxTextEntry DoGetValue() change

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

diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index 9f12398fb66faf286c32146bf957067f25e0dadd..d7b27a4777e399efd0bfe7fccce45b67964f925b 100644 (file)
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -66,9 +66,18 @@ wxString wxMessageDialog::GetDefaultCancelLabel() const
     return GTK_STOCK_CANCEL;
 }
 
-void wxMessageDialog::DoSetCustomLabel(wxString& var, const wxString& value)
+void wxMessageDialog::DoSetCustomLabel(wxString& var, const ButtonLabel& label)
 {
-    var = wxConvertMnemonicsToGTK(value);
+    int stockId = label.GetStockId();
+    if ( stockId == wxID_NONE )
+    {
+        wxMessageDialogWithCustomLabels::DoSetCustomLabel(var, label);
+        var = wxConvertMnemonicsToGTK(var);
+    }
+    else // stock label
+    {
+        var = wxGetStockGtkID(stockId);
+    }
 }
 
 void wxMessageDialog::GTKCreateMsgDialog()
@@ -187,26 +196,42 @@ void wxMessageDialog::GTKCreateMsgDialog()
     {
         if ( addButtons )
         {
-            gtk_dialog_add_button(dlg, GetNoLabel(), GTK_RESPONSE_NO);
-            gtk_dialog_add_button(dlg, GetYesLabel(), GTK_RESPONSE_YES);
+            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, GetCancelLabel(),
+                gtk_dialog_add_button(dlg, wxGTK_CONV(GetCancelLabel()),
                                       GTK_RESPONSE_CANCEL);
             }
         }
 
-        gtk_dialog_set_default_response(dlg,
-                                        m_dialogStyle & wxNO_DEFAULT
-                                            ? GTK_RESPONSE_NO
-                                            : GTK_RESPONSE_YES);
+        // it'd probably be harmless to call gtk_dialog_set_default_response()
+        // twice but why do it if we're going to change the default below
+        // anyhow
+        if ( !(m_dialogStyle & wxCANCEL_DEFAULT) )
+        {
+            gtk_dialog_set_default_response(dlg,
+                                            m_dialogStyle & wxNO_DEFAULT
+                                                ? GTK_RESPONSE_NO
+                                                : GTK_RESPONSE_YES);
+        }
     }
     else if ( addButtons ) // Ok or Ok/Cancel dialog
     {
-        gtk_dialog_add_button(dlg, GetOKLabel(), GTK_RESPONSE_OK);
+        gtk_dialog_add_button(dlg, wxGTK_CONV(GetOKLabel()), GTK_RESPONSE_OK);
         if ( m_dialogStyle & wxCANCEL )
-            gtk_dialog_add_button(dlg, GetCancelLabel(), GTK_RESPONSE_CANCEL);
+        {
+            gtk_dialog_add_button(dlg, wxGTK_CONV(GetCancelLabel()),
+                                  GTK_RESPONSE_CANCEL);
+        }
+    }
+
+    if ( m_dialogStyle & wxCANCEL_DEFAULT )
+    {
+        gtk_dialog_set_default_response(dlg, GTK_RESPONSE_CANCEL);
     }
 }