fixed crash when closing window that contains STC (patch 1017268)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -742,6 +742,9 @@ wxWindowMac::~wxWindowMac()
|
|||||||
}
|
}
|
||||||
#endif // __WXUNIVERSAL__
|
#endif // __WXUNIVERSAL__
|
||||||
|
|
||||||
|
// destroy children before destroying this window itself
|
||||||
|
DestroyChildren();
|
||||||
|
|
||||||
// wxRemoveMacControlAssociation( this ) ;
|
// wxRemoveMacControlAssociation( this ) ;
|
||||||
// If we delete an item, we should initialize the parent panel,
|
// If we delete an item, we should initialize the parent panel,
|
||||||
// because it could now be invalid.
|
// because it could now be invalid.
|
||||||
@@ -772,8 +775,6 @@ wxWindowMac::~wxWindowMac()
|
|||||||
frame->SetLastFocus( NULL ) ;
|
frame->SetLastFocus( NULL ) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
DestroyChildren();
|
|
||||||
|
|
||||||
// delete our drop target if we've got one
|
// delete our drop target if we've got one
|
||||||
#if wxUSE_DRAG_AND_DROP
|
#if wxUSE_DRAG_AND_DROP
|
||||||
if ( m_dropTarget != NULL )
|
if ( m_dropTarget != NULL )
|
||||||
|
Reference in New Issue
Block a user