don't reset tool/status bar pointers manually, it is now done automatically by the...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index 248c03e48c402b0991239f0495f78b83eef37c42..b009b1ebe63f785a6c3b48fea4c9b682775407fe 100644 (file)
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -105,26 +105,10 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
 wxMDIParentFrame::~wxMDIParentFrame()
 {
     DestroyChildren();
 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 ;
     
     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();
     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)
 }
 
 void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)