fixed wxDialog creation (created window wasn't transient)

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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 3e432d3f01c69f7dc7b84e9d47a2a3786c013906..5a90fb519d7122ee41f5fee4b4709dee55346686 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -379,8 +379,11 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
 
     m_widget = gtk_window_new( win_type );
 
-    if ((m_parent) && (HasFlag(wxFRAME_FLOAT_ON_PARENT)) && (GTK_IS_WINDOW(m_parent->m_widget)))
+    if (m_parent && (GTK_IS_WINDOW(m_parent->m_widget)) &&
+        (HasFlag(wxFRAME_FLOAT_ON_PARENT) || (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)))
+    {
         gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
+    }
 
     if (!name.IsEmpty())
         gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() );

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 3e432d3f01c69f7dc7b84e9d47a2a3786c013906..5a90fb519d7122ee41f5fee4b4709dee55346686 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -379,8 +379,11 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
 
     m_widget = gtk_window_new( win_type );
 
-    if ((m_parent) && (HasFlag(wxFRAME_FLOAT_ON_PARENT)) && (GTK_IS_WINDOW(m_parent->m_widget)))
+    if (m_parent && (GTK_IS_WINDOW(m_parent->m_widget)) &&
+        (HasFlag(wxFRAME_FLOAT_ON_PARENT) || (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)))
+    {
         gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
+    }
 
     if (!name.IsEmpty())
         gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() );