Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use GetParentForModalDialog() in ShowModal() to ensure we don't select a window being deleted as parent

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-23 20:09:35 +00:00
parent 893f78406d
commit 31fdb8d993
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gtk/dialog.cpp
View File

@@ -115,14 +115,11 @@ int wxDialog::ShowModal()
// forbidden // forbidden
if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) ) if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
{ {
wxWindow *parent = wxTheApp->GetTopWindow(); wxWindow * const parent = GetParentForModalDialog();
if ( parent && if ( parent && parent != this )
parent != this &&
!parent->IsBeingDeleted() &&
!(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
{ {
m_parent = parent; gtk_window_set_transient_for( GTK_WINDOW(m_widget),
gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(parent->m_widget) ); GTK_WINDOW(parent->m_widget) );
} }
} }