From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 16 Aug 2002 10:33:41 +0000 (+0000)
Subject: Applied patch [ 594717 ] Implements wxFRAME_FLOAT_ON_PARENT
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/508196798b9e693aab6aa9e223acc1a725567c8a

Applied patch [ 594717 ] Implements wxFRAME_FLOAT_ON_PARENT
By John Skiff


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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 73fc746c0b..7495f88322 100644
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -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) );
     }
diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 73fc746c0b..7495f88322 100644
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -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) );
     }