From 35eace3ae6ec28b7c665d0b43bec6a24ac59ad14 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 23 Dec 2003 12:39:33 +0000 Subject: [PATCH] Added wxUSE_TOOLBAR, wxUSE_STATUSBAR tests git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/mdi.cpp | 8 ++++++++ src/mac/mdi.cpp | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp index 43681bddfa..add9482e11 100644 --- a/src/mac/carbon/mdi.cpp +++ b/src/mac/carbon/mdi.cpp @@ -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) diff --git a/src/mac/mdi.cpp b/src/mac/mdi.cpp index 43681bddfa..add9482e11 100644 --- a/src/mac/mdi.cpp +++ b/src/mac/mdi.cpp @@ -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) -- 2.47.2