fixed wxGTK1's wxDialog::ShowModal() to use GetParentForModalDialog()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-12-16 18:15:43 +00:00
parent 71d1d0e2e6
commit 16b0811668

View File

@@ -192,10 +192,8 @@ int wxDialog::ShowModal()
if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) ) if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
{ {
wxWindow *parent = wxTheApp->GetTopWindow(); wxWindow *parent = wxTheApp->GetTopWindow();
if ( parent && wxWindow * const parent = GetParentForModalDialog();
parent != this && if ( parent && parent != this )
!parent->IsBeingDeleted() &&
!(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
{ {
m_parent = parent; 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) );