AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't reset tool/status bar pointers manually, it is now done automatically by the dtors of the bars themselves

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2004-10-16 20:28:36 +00:00
parent 2ab822146c
commit ea3cdc4f89
1 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/mac/carbon/mdi.cpp
View File

@ -105,26 +105,10 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
wxMDIParentFrame::~wxMDIParentFrame()
{
DestroyChildren();
// already delete by DestroyChildren()
#if wxUSE_TOOLBAR
m_frameToolBar = NULL;
#endif
#if wxUSE_STATUSBAR
m_frameStatusBar = NULL;
#endif
// already deleted by DestroyChildren()
m_clientWindow = NULL ;
if (m_windowMenu)
{
delete m_windowMenu;
m_windowMenu = (wxMenu*) NULL;
}
if ( m_clientWindow )
{
delete m_clientWindow;
m_clientWindow = NULL ;
}
delete m_windowMenu;
}
@ -291,13 +275,6 @@ wxMDIChildFrame::~wxMDIChildFrame()
if(mdiparent->m_currentChild == this)
mdiparent->m_currentChild = NULL;
DestroyChildren();
// already delete by DestroyChildren()
#if wxUSE_TOOLBAR
m_frameToolBar = NULL;
#endif
#if wxUSE_STATUSBAR
m_frameStatusBar = NULL;
#endif
}
void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)