From e25c7537ffc48c1e867a084e2258a346160b6e47 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 3 Oct 2004 19:38:32 +0000 Subject: [PATCH] fixed transiency when the parent is MDI child frame git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/toplevel.cpp | 6 ++++-- src/gtk1/toplevel.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp index cb412255eb..04a1777d3c 100644 --- a/src/gtk/toplevel.cpp +++ b/src/gtk/toplevel.cpp @@ -451,11 +451,13 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, } } - if (m_parent && (((GTK_IS_WINDOW(m_parent->m_widget)) && + wxWindow *topParent = wxGetTopLevelParent(m_parent); + if (topParent && (((GTK_IS_WINDOW(topParent->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) ); + gtk_window_set_transient_for( GTK_WINDOW(m_widget), + GTK_WINDOW(topParent->m_widget) ); } #if GTK_CHECK_VERSION(2,2,0) diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp index cb412255eb..04a1777d3c 100644 --- a/src/gtk1/toplevel.cpp +++ b/src/gtk1/toplevel.cpp @@ -451,11 +451,13 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, } } - if (m_parent && (((GTK_IS_WINDOW(m_parent->m_widget)) && + wxWindow *topParent = wxGetTopLevelParent(m_parent); + if (topParent && (((GTK_IS_WINDOW(topParent->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) ); + gtk_window_set_transient_for( GTK_WINDOW(m_widget), + GTK_WINDOW(topParent->m_widget) ); } #if GTK_CHECK_VERSION(2,2,0) -- 2.45.2