use GetParentForModalDialog() in ShowModal() to ensure we don't select a window being...

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

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 75b82b73030aa0bc4ea476636bee4002c1841c9c..7688d3329b11fb52cc7f9d95a236a71004b25495 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -115,14 +115,11 @@ int wxDialog::ShowModal()
     // forbidden
     if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
     {
-        wxWindow *parent = wxTheApp->GetTopWindow();
-        if ( parent &&
-                parent != this &&
-                    !parent->IsBeingDeleted() &&
-                        !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
+        wxWindow * const parent = GetParentForModalDialog();
+        if ( parent && parent != this )
         {
-            m_parent = parent;
-            gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(parent->m_widget) );
+            gtk_window_set_transient_for( GTK_WINDOW(m_widget),
+                                          GTK_WINDOW(parent->m_widget) );
         }
     }