Don't pop explicitly changed status messages.

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

diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index d7b27a4777e399efd0bfe7fccce45b67964f925b..3b94755b95fef4da618bfb2e113376ace4947f49 100644 (file)
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -86,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";
@@ -127,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)
@@ -137,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;
     }
 
@@ -247,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
@@ -263,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: