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

don't select the window about to be deleted as parent for modal dialog in ShowModal()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@45606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-23 20:11:11 +00:00
parent 0fe70eff13
commit d420454eb1
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/dialog.cpp
View File

@@ -115,14 +115,20 @@ int wxDialog::ShowModal()
// forbidden // forbidden
if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) ) if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
{ {
wxWindow *parent = wxTheApp->GetTopWindow(); extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;
wxWindow * const parent = wxTheApp->GetTopWindow();
if ( parent && if ( parent &&
parent != this && parent != this &&
parent->IsShownOnScreen() &&
!parent->IsBeingDeleted() && !parent->IsBeingDeleted() &&
!wxPendingDelete.Member(parent) &&
!(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) ) !(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) );
} }
} }