explicitly return NFR_UNICODE from WM_NOTIFYFORMAT when using MSLU

[wxWidgets.git] / src / mac / mdi.cpp

diff --git a/src/mac/mdi.cpp b/src/mac/mdi.cpp
index 43681bddfaaff9776f08415a6c51c9f15ef43837..add9482e11de078008fb6baa52ae202ebc40c74c 100644 (file)
--- 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)