showing a bevel button for a multiline label (is not multline on the OS level, but...

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

diff --git a/src/gtk1/msgdlg.cpp b/src/gtk1/msgdlg.cpp
index 85ac15e5ebb37a3e1289a2636b13e0572385b52e..610b4ec11ad84996a08fda0bbe30392557ea3cca 100644 (file)
--- a/src/gtk1/msgdlg.cpp
+++ b/src/gtk1/msgdlg.cpp
@@ -9,7 +9,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "msgdlg.h"
 #endif
 
@@ -20,7 +20,7 @@
 #pragma hdrstop
 #endif
 
-#if wxUSE_MSGDLG && defined(__WXGTK20__)
+#if wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)
 
 #include "wx/gtk/private.h"
 #include <gtk/gtk.h>
@@ -39,15 +39,15 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
     m_caption = caption;
     m_message = message;
     m_dialogStyle = style;
-    m_parent = parent;
+    m_parent = wxGetTopLevelParent(parent);
 }
 
 int wxMessageDialog::ShowModal()
 {
     GtkWidget *dlg;
-    GtkMessageType type;
+    GtkMessageType type = GTK_MESSAGE_ERROR;
     GtkButtonsType buttons = GTK_BUTTONS_OK;
-    
+
     if (m_dialogStyle & wxYES_NO)
     {
         buttons = GTK_BUTTONS_YES_NO;
@@ -60,7 +60,7 @@ int wxMessageDialog::ShowModal()
         else
             buttons = GTK_BUTTONS_OK;
     }
-    
+
     if (m_dialogStyle & wxICON_EXCLAMATION)
         type = GTK_MESSAGE_WARNING;
     else if (m_dialogStyle & wxICON_ERROR)
@@ -69,6 +69,11 @@ int wxMessageDialog::ShowModal()
         type = GTK_MESSAGE_INFO;
     else if (m_dialogStyle & wxICON_QUESTION)
         type = GTK_MESSAGE_QUESTION;
+    else
+    {
+        // GTK+ doesn't have a "typeless" msg box, so try to auto detect...
+        type = m_dialogStyle & wxYES ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO;
+    }
 
     dlg = gtk_message_dialog_new(m_parent ?
                                     GTK_WINDOW(m_parent->m_widget) : NULL,
@@ -88,7 +93,7 @@ int wxMessageDialog::ShowModal()
         else
             gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_YES);
     }
-    
+
     gint result = gtk_dialog_run(GTK_DIALOG(dlg));
     gtk_widget_destroy(dlg);
 
@@ -98,7 +103,7 @@ int wxMessageDialog::ShowModal()
             wxFAIL_MSG(_T("unexpected GtkMessageDialog return code"));
             // fall through
 
-        case GTK_RESPONSE_CANCEL: 
+        case GTK_RESPONSE_CANCEL:
             return wxID_CANCEL;
         case GTK_RESPONSE_OK:
             return wxID_OK;