-start experimental use of RunApplicationEventLoop,

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

diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index 2dd5336e657193c47d39cb5e4d2af271a1bdd2d5..97ce07c6166d9c1b14d82e8b47eb943dd312c5c4 100644 (file)
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -39,12 +39,8 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
     m_caption = caption;
     m_message = message;
     m_dialogStyle = style;
     m_caption = caption;
     m_message = message;
     m_dialogStyle = style;

-    m_parent = parent;
-}
+    m_parent = wxGetTopLevelParent(parent);

 
 

-int wxMessageDialog::ShowModal()
-{
-    GtkWidget *dlg;

     GtkMessageType type = GTK_MESSAGE_ERROR;
     GtkButtonsType buttons = GTK_BUTTONS_OK;
 
     GtkMessageType type = GTK_MESSAGE_ERROR;
     GtkButtonsType buttons = GTK_BUTTONS_OK;
 


@@ -70,29 +66,36 @@ int wxMessageDialog::ShowModal()
     else if (m_dialogStyle & wxICON_QUESTION)
         type = GTK_MESSAGE_QUESTION;
     else
     else if (m_dialogStyle & wxICON_QUESTION)
         type = GTK_MESSAGE_QUESTION;
     else

-        wxFAIL_MSG( _T("Unknown wxMessageDialog type") );
+    {
+        // 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,
-                                 GTK_DIALOG_MODAL,
-                                 type, buttons,
-                                 "%s", (const char*)wxGTK_CONV(m_message));
+    m_widget = gtk_message_dialog_new(m_parent ?
+                                          GTK_WINDOW(m_parent->m_widget) : NULL,
+                                      GTK_DIALOG_MODAL,
+                                      type, buttons,
+                                      "%s", (const char*)wxGTK_CONV(m_message));

     if (m_caption != wxMessageBoxCaptionStr)
     if (m_caption != wxMessageBoxCaptionStr)

-        gtk_window_set_title(GTK_WINDOW(dlg), wxGTK_CONV(m_caption));
+        gtk_window_set_title(GTK_WINDOW(m_widget), wxGTK_CONV(m_caption));

 
     if (m_dialogStyle & wxYES_NO)
     {
         if (m_dialogStyle & wxCANCEL)
 
     if (m_dialogStyle & wxYES_NO)
     {
         if (m_dialogStyle & wxCANCEL)

-            gtk_dialog_add_button(GTK_DIALOG(dlg), GTK_STOCK_CANCEL,
+            gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_CANCEL,

                                   GTK_RESPONSE_CANCEL);
         if (m_dialogStyle & wxNO_DEFAULT)
                                   GTK_RESPONSE_CANCEL);
         if (m_dialogStyle & wxNO_DEFAULT)

-            gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_NO);
+            gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_NO);

         else
         else

-            gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_YES);
+            gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_YES);

     }
     }

-
-    gint result = gtk_dialog_run(GTK_DIALOG(dlg));
-    gtk_widget_destroy(dlg);
+}
+ 
+int wxMessageDialog::ShowModal()
+{
+    gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
+    gtk_widget_destroy(m_widget);
+    m_widget = NULL;

 
     switch (result)
     {
 
     switch (result)
     {


@@ -111,5 +114,6 @@ int wxMessageDialog::ShowModal()
     }
 }
 
     }
 }
 

+

 #endif // wxUSE_MSGDLG && defined(__WXGTK20__)
 
 #endif // wxUSE_MSGDLG && defined(__WXGTK20__)