X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9276358892b129bbed2c52028b3485df02117918..fdf20a26dba64a6d31dead1e1d19b2d755c0af13:/src/gtk/msgdlg.cpp

diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index 9f12398fb6..3b94755b95 100644
--- 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()
@@ -77,7 +86,9 @@ void wxMessageDialog::GTKCreateMsgDialog()
 
 #if wxUSE_LIBHILDON
     const char *stockIcon;
-    if ( m_dialogStyle & wxICON_ERROR )
+    if ( m_dialogStyle & wxICON_NONE )
+        stockIcon = "";
+    else if ( m_dialogStyle & wxICON_ERROR )
         stockIcon = "qgn_note_gene_syserror";
     else if ( m_dialogStyle & wxICON_EXCLAMATION )
         stockIcon = "qgn_note_gene_syswarning";
@@ -118,6 +129,11 @@ void wxMessageDialog::GTKCreateMsgDialog()
         }
     }
 
+#ifdef __WXGTK210__
+    if ( gtk_check_version(2, 10, 0) == NULL && (m_dialogStyle & wxICON_NONE))
+        type = GTK_MESSAGE_OTHER;
+    else
+#endif // __WXGTK210__
     if (m_dialogStyle & wxICON_EXCLAMATION)
         type = GTK_MESSAGE_WARNING;
     else if (m_dialogStyle & wxICON_ERROR)
@@ -128,7 +144,8 @@ void wxMessageDialog::GTKCreateMsgDialog()
         type = GTK_MESSAGE_QUESTION;
     else
     {
-        // GTK+ doesn't have a "typeless" msg box, so try to auto detect...
+        // if no style is explicitly specified, detect the suitable icon
+        // ourselves (this can be disabled by using wxICON_NONE)
         type = m_dialogStyle & wxYES ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO;
     }
 
@@ -187,26 +204,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);
     }
 }
 
@@ -222,7 +255,7 @@ int wxMessageDialog::ShowModal()
     {
         GTKCreateMsgDialog();
         wxCHECK_MSG( m_widget, wxID_CANCEL,
-                     _T("failed to create GtkMessageDialog") );
+                     wxT("failed to create GtkMessageDialog") );
     }
 
     // This should be necessary, but otherwise the
@@ -238,7 +271,7 @@ int wxMessageDialog::ShowModal()
     switch (result)
     {
         default:
-            wxFAIL_MSG(_T("unexpected GtkMessageDialog return code"));
+            wxFAIL_MSG(wxT("unexpected GtkMessageDialog return code"));
             // fall through
 
         case GTK_RESPONSE_CANCEL: