wxExecuteData is a struct, not class (warning fix)

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

diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index 43681bddfaaff9776f08415a6c51c9f15ef43837..1cdfc54d3bd8341663b9ccf80307e1a6b92d8b75 100644 (file)
--- 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)
@@ -258,9 +262,8 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
     
     MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
     
-    m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
-    SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
-    
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
+
     wxModelessWindows.Append(this);
     return FALSE;
 }
@@ -273,8 +276,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)
@@ -361,14 +368,8 @@ wxMDIClientWindow::~wxMDIClientWindow()
 
 bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
 {
-    
-    m_windowId = (int)NewControlId();
-    
-    if ( parent )
-    {
-        parent->AddChild(this);
-    }
-    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
+    if ( !wxWindow::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style))
+        return FALSE;
     
     wxModelessWindows.Append(this);
     return TRUE;