]> git.saurik.com Git - wxWidgets.git/commitdiff
Applied patch [ 594717 ] Implements wxFRAME_FLOAT_ON_PARENT
authorJulian Smart <julian@anthemion.co.uk>
Fri, 16 Aug 2002 10:33:41 +0000 (10:33 +0000)
committerJulian Smart <julian@anthemion.co.uk>
Fri, 16 Aug 2002 10:33:41 +0000 (10:33 +0000)
By John Skiff

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

src/gtk/toplevel.cpp
src/gtk1/toplevel.cpp

index 73fc746c0b1e2b4a01fa878e56901382be4965e5..7495f88322747dec97ef52d46b776bc81b53a227 100644 (file)
@@ -362,8 +362,9 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
 
     m_widget = gtk_window_new( win_type );
 
-    if (m_parent && (GTK_IS_WINDOW(m_parent->m_widget)) &&
-        (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG))
+    if (m_parent && (((GTK_IS_WINDOW(m_parent->m_widget)) &&
+                     (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)) ||
+                    (style & wxFRAME_FLOAT_ON_PARENT)))
     {
         gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
     }
index 73fc746c0b1e2b4a01fa878e56901382be4965e5..7495f88322747dec97ef52d46b776bc81b53a227 100644 (file)
@@ -362,8 +362,9 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
 
     m_widget = gtk_window_new( win_type );
 
-    if (m_parent && (GTK_IS_WINDOW(m_parent->m_widget)) &&
-        (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG))
+    if (m_parent && (((GTK_IS_WINDOW(m_parent->m_widget)) &&
+                     (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)) ||
+                    (style & wxFRAME_FLOAT_ON_PARENT)))
     {
         gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
     }