This change will make the parent TLW come to

    the front again after it has been sent to
    the back for some unknown reason, after a
    message dialog has been show.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index 6ca49154810bada7180376d09d45ba4b0f230abe..4e3eb6d2fffec35581036cd5d0a8a957e801a30d 100644 (file)
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -90,7 +90,7 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
             gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_YES);
     }
 
             gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_YES);
     }
 

-    if (parent)
+    if (m_parent)

         gtk_window_set_transient_for(GTK_WINDOW(m_widget),
                                      GTK_WINDOW(m_parent->m_widget));
 }
         gtk_window_set_transient_for(GTK_WINDOW(m_widget),
                                      GTK_WINDOW(m_parent->m_widget));
 }


@@ -101,6 +101,11 @@ wxMessageDialog::~wxMessageDialog()
 
 int wxMessageDialog::ShowModal()
 {
 
 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;
     gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
     gtk_widget_destroy(m_widget);
     m_widget = NULL;

diff --git a/src/gtk1/msgdlg.cpp b/src/gtk1/msgdlg.cpp
index 6ca49154810bada7180376d09d45ba4b0f230abe..4e3eb6d2fffec35581036cd5d0a8a957e801a30d 100644 (file)
--- a/src/gtk1/msgdlg.cpp
+++ b/src/gtk1/msgdlg.cpp
@@ -90,7 +90,7 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
             gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_YES);
     }
 
             gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_YES);
     }
 

-    if (parent)
+    if (m_parent)

         gtk_window_set_transient_for(GTK_WINDOW(m_widget),
                                      GTK_WINDOW(m_parent->m_widget));
 }
         gtk_window_set_transient_for(GTK_WINDOW(m_widget),
                                      GTK_WINDOW(m_parent->m_widget));
 }


@@ -101,6 +101,11 @@ wxMessageDialog::~wxMessageDialog()
 
 int wxMessageDialog::ShowModal()
 {
 
 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;
     gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
     gtk_widget_destroy(m_widget);
     m_widget = NULL;