X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2ce5e1b2792f53e2e4a1e5f5678ab31c83559c7..7e4fb3b8168f4f2dbf2f8a246d3e094a8ccba194:/src/gtk/msgdlg.cpp

diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index 97ce07c616..4e3eb6d2ff 100644
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -22,10 +22,10 @@
 
 #if wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)
 
+#include "wx/msgdlg.h"
 #include "wx/gtk/private.h"
 #include <gtk/gtk.h>
 
-#include "wx/msgdlg.h"
 #include "wx/intl.h"
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
@@ -89,10 +89,23 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
         else
             gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_YES);
     }
+
+    if (m_parent)
+        gtk_window_set_transient_for(GTK_WINDOW(m_widget),
+                                     GTK_WINDOW(m_parent->m_widget));
 }
  
+wxMessageDialog::~wxMessageDialog()
+{
+}
+
 int wxMessageDialog::ShowModal()
 {
+    // This should be necessary, but otherwise the
+    // parent TLW will disappear..
+    if (m_parent)
+        gtk_window_present( GTK_WINDOW(m_parent->m_widget) );
+        
     gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
     gtk_widget_destroy(m_widget);
     m_widget = NULL;
@@ -104,6 +117,8 @@ int wxMessageDialog::ShowModal()
             // fall through
 
         case GTK_RESPONSE_CANCEL:
+        case GTK_RESPONSE_DELETE_EVENT:
+        case GTK_RESPONSE_CLOSE:
             return wxID_CANCEL;
         case GTK_RESPONSE_OK:
             return wxID_OK;