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

Added wxUSE_TOOLBAR, wxUSE_STATUSBAR tests

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-12-23 12:39:33 +00:00
parent 5feef956ce
commit 35eace3ae6
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,8 +106,12 @@ wxMDIParentFrame::~wxMDIParentFrame()
{ {
DestroyChildren(); DestroyChildren();
// already delete by DestroyChildren() // already delete by DestroyChildren()
#if wxUSE_TOOLBAR
m_frameToolBar = NULL; m_frameToolBar = NULL;
#endif
#if wxUSE_STATUSBAR
m_frameStatusBar = NULL; m_frameStatusBar = NULL;
#endif
m_clientWindow = NULL ; m_clientWindow = NULL ;
if (m_windowMenu) if (m_windowMenu)
@@ -273,8 +277,12 @@ wxMDIChildFrame::~wxMDIChildFrame()
mdiparent->m_currentChild = NULL; mdiparent->m_currentChild = NULL;
DestroyChildren(); DestroyChildren();
// already delete by DestroyChildren() // already delete by DestroyChildren()
#if wxUSE_TOOLBAR
m_frameToolBar = NULL; m_frameToolBar = NULL;
#endif
#if wxUSE_STATUSBAR
m_frameStatusBar = NULL; m_frameStatusBar = NULL;
#endif
} }
void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar) void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)

8
src/mac/mdi.cpp
View File

@@ -106,8 +106,12 @@ wxMDIParentFrame::~wxMDIParentFrame()
{ {
DestroyChildren(); DestroyChildren();
// already delete by DestroyChildren() // already delete by DestroyChildren()
#if wxUSE_TOOLBAR
m_frameToolBar = NULL; m_frameToolBar = NULL;
#endif
#if wxUSE_STATUSBAR
m_frameStatusBar = NULL; m_frameStatusBar = NULL;
#endif
m_clientWindow = NULL ; m_clientWindow = NULL ;
if (m_windowMenu) if (m_windowMenu)
@@ -273,8 +277,12 @@ wxMDIChildFrame::~wxMDIChildFrame()
mdiparent->m_currentChild = NULL; mdiparent->m_currentChild = NULL;
DestroyChildren(); DestroyChildren();
// already delete by DestroyChildren() // already delete by DestroyChildren()
#if wxUSE_TOOLBAR
m_frameToolBar = NULL; m_frameToolBar = NULL;
#endif
#if wxUSE_STATUSBAR
m_frameStatusBar = NULL; m_frameStatusBar = NULL;
#endif
} }
void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar) void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)