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

call RemoveChild() in ~wxWindowBase instead of doing it in each ~wxWindow for each port

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-09-15 11:45:08 +00:00
parent 8bdd5efa86
commit 8e35ab96f6
11 changed files with 11 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/wincmn.cpp
View File

@@ -266,6 +266,17 @@ wxWindowBase::~wxWindowBase()
wxASSERT_MSG( GetChildren().GetCount() == 0, wxT("children not destroyed") );
// reset the dangling pointer our parent window may keep to us
if ( m_parent )
{
if ( m_parent->GetDefaultItem() == this )
{
m_parent->SetDefaultItem(NULL);
}
m_parent->RemoveChild(this);
}
#if wxUSE_CARET
delete m_caret;
#endif // wxUSE_CARET
@@ -305,12 +316,6 @@ wxWindowBase::~wxWindowBase()
#if wxUSE_ACCESSIBILITY
delete m_accessible;
#endif
// reset the dangling pointer our parent window may keep to us
if ( m_parent && m_parent->GetDefaultItem() == this )
{
m_parent->SetDefaultItem(NULL);
}
}
bool wxWindowBase::Destroy()
@@ -343,10 +348,6 @@ bool wxWindowBase::DestroyChildren()
wxWindow *child = node->GetData();
wxASSERT_MSG( child, wxT("children list contains empty nodes") );
child->Show(FALSE);
child->Destroy();
wxASSERT_MSG( !GetChildren().Find(child),