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

don't use windows about to be destroyed as implicit dialog parent

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-10-20 00:10:51 +00:00
parent 5d6c436536
commit e058b98d8a
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtk/dialog.cpp
View File

@@ -198,7 +198,7 @@ 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 && parent != this ) if ( parent && parent != this && parent->IsBeingDeleted() )
{ {
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) );

2
src/gtk1/dialog.cpp
View File

@@ -198,7 +198,7 @@ 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 && parent != this ) if ( parent && parent != this && parent->IsBeingDeleted() )
{ {
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) );

6
src/msw/toplevel.cpp
View File

@@ -192,6 +192,12 @@ bool wxTopLevelWindowMSW::CreateDialog(const wxChar *dlgTemplate,
if ( !parent && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) ) if ( !parent && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
{ {
parent = wxTheApp->GetTopWindow(); parent = wxTheApp->GetTopWindow();
// but don't use the window which is about to be destroyed as parent
if ( parent->IsBeingDeleted() )
{
parent = NULL;
}
} }
m_hWnd = (WXHWND)::CreateDialog(wxGetInstance(), m_hWnd = (WXHWND)::CreateDialog(wxGetInstance(),