Added wxUSE_TOOLBAR, wxUSE_STATUSBAR tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -106,8 +106,12 @@ wxMDIParentFrame::~wxMDIParentFrame()
|
||||
{
|
||||
DestroyChildren();
|
||||
// already delete by DestroyChildren()
|
||||
#if wxUSE_TOOLBAR
|
||||
m_frameToolBar = NULL;
|
||||
#endif
|
||||
#if wxUSE_STATUSBAR
|
||||
m_frameStatusBar = NULL;
|
||||
#endif
|
||||
m_clientWindow = NULL ;
|
||||
|
||||
if (m_windowMenu)
|
||||
@@ -273,8 +277,12 @@ wxMDIChildFrame::~wxMDIChildFrame()
|
||||
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)
|
||||
|
@@ -106,8 +106,12 @@ wxMDIParentFrame::~wxMDIParentFrame()
|
||||
{
|
||||
DestroyChildren();
|
||||
// already delete by DestroyChildren()
|
||||
#if wxUSE_TOOLBAR
|
||||
m_frameToolBar = NULL;
|
||||
#endif
|
||||
#if wxUSE_STATUSBAR
|
||||
m_frameStatusBar = NULL;
|
||||
#endif
|
||||
m_clientWindow = NULL ;
|
||||
|
||||
if (m_windowMenu)
|
||||
@@ -273,8 +277,12 @@ wxMDIChildFrame::~wxMDIChildFrame()
|
||||
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)
|
||||
|
Reference in New Issue
Block a user