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

reset m_frameTool/StatusBar pointers before deleting them (bug 773474)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-02-07 23:48:13 +00:00
parent bb655eade9
commit d1e44484f7
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/msw/mdi.cpp
View File

@@ -233,12 +233,12 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
wxMDIParentFrame::~wxMDIParentFrame() wxMDIParentFrame::~wxMDIParentFrame()
{ {
DestroyChildren(); // see comment in ~wxMDIChildFrame
// already delete by DestroyChildren()
m_frameToolBar = NULL; m_frameToolBar = NULL;
m_frameStatusBar = NULL; m_frameStatusBar = NULL;
DestroyChildren();
if (m_windowMenu) if (m_windowMenu)
{ {
delete m_windowMenu; delete m_windowMenu;
@@ -730,12 +730,13 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
wxMDIChildFrame::~wxMDIChildFrame() wxMDIChildFrame::~wxMDIChildFrame()
{ {
DestroyChildren(); // will be destroyed by DestroyChildren() but reset them before calling it
// to avoid using dangling pointers if a callback comes in the meanwhile
// already deleted by DestroyChildren()
m_frameToolBar = NULL; m_frameToolBar = NULL;
m_frameStatusBar = NULL; m_frameStatusBar = NULL;
DestroyChildren();
RemoveWindowMenu(NULL, m_hMenu); RemoveWindowMenu(NULL, m_hMenu);
MSWDestroyWindow(); MSWDestroyWindow();