X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70024cfb08196f1e154b03fec3ba1b4368ab9f36..e11898f903183f897a2b2a50a4447ea73ba7273f:/src/mac/carbon/mdi.cpp

diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index ef00515991..1cdfc54d3b 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)
@@ -131,19 +135,19 @@ void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
 
 void wxMDIParentFrame::MacActivate(long timestamp, bool activating)
 {
-    wxLogDebug("MDI PARENT=%p MacActivate(0x%08lx,%s)",this,timestamp,activating?"ACTIV":"deact");
+    wxLogDebug(wxT("MDI PARENT=%p MacActivate(0x%08lx,%s)"),this,timestamp,activating?wxT("ACTIV"):wxT("deact"));
     if(activating)
     {
         if(s_macDeactivateWindow && s_macDeactivateWindow->GetParent()==this)
         {
-            wxLogDebug("child had been scheduled for deactivation, rehighlighting");
+            wxLogDebug(wxT("child had been scheduled for deactivation, rehighlighting"));
             UMAHighlightAndActivateWindow((WindowRef)s_macDeactivateWindow->MacGetWindowRef(), true);
-            wxLogDebug("done highliting child");
+            wxLogDebug(wxT("done highliting child"));
             s_macDeactivateWindow = NULL;
         }
         else if(s_macDeactivateWindow == this)
         {
-            wxLogDebug("Avoided deactivation/activation of this=%p", this);
+            wxLogDebug(wxT("Avoided deactivation/activation of this=%p"), this);
             s_macDeactivateWindow = NULL;
         }
         else // window to deactivate is NULL or is not us or one of our kids
@@ -168,8 +172,8 @@ void wxMDIParentFrame::MacActivate(long timestamp, bool activating)
         else // schedule ourselves for deactivation
         {
             if(s_macDeactivateWindow)
-                wxLogDebug("window=%p SHOULD have been deactivated, oh well!",s_macDeactivateWindow);
-            wxLogDebug("Scheduling delayed MDI Parent deactivation");
+                wxLogDebug(wxT("window=%p SHOULD have been deactivated, oh well!"),s_macDeactivateWindow);
+            wxLogDebug(wxT("Scheduling delayed MDI Parent deactivation"));
             s_macDeactivateWindow = this;
         }
     }
@@ -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)
@@ -284,16 +291,16 @@ void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)
 
 void wxMDIChildFrame::MacActivate(long timestamp, bool activating)
 {
-    wxLogDebug("MDI child=%p  MacActivate(0x%08lx,%s)",this,timestamp,activating?"ACTIV":"deact");
+    wxLogDebug(wxT("MDI child=%p  MacActivate(0x%08lx,%s)"),this,timestamp,activating?wxT("ACTIV"):wxT("deact"));
     wxMDIParentFrame *mdiparent = wxDynamicCast(m_parent, wxMDIParentFrame);
     wxASSERT(mdiparent);
     if(activating)
     {
         if(s_macDeactivateWindow == m_parent)
         {
-            wxLogDebug("parent had been scheduled for deactivation, rehighlighting");
+            wxLogDebug(wxT("parent had been scheduled for deactivation, rehighlighting"));
             UMAHighlightAndActivateWindow((WindowRef)s_macDeactivateWindow->MacGetWindowRef(), true);
-            wxLogDebug("done highliting parent");
+            wxLogDebug(wxT("done highliting parent"));
             s_macDeactivateWindow = NULL;
         }
         else if((mdiparent->m_currentChild==this) || !s_macDeactivateWindow)
@@ -305,7 +312,7 @@ void wxMDIChildFrame::MacActivate(long timestamp, bool activating)
 
         if(s_macDeactivateWindow==this)
         {
-            wxLogDebug("Avoided deactivation/activation of this=%p",this);
+            wxLogDebug(wxT("Avoided deactivation/activation of this=%p"),this);
             s_macDeactivateWindow=NULL;
         }
         else
@@ -324,8 +331,8 @@ void wxMDIChildFrame::MacActivate(long timestamp, bool activating)
         else // schedule ourselves for deactivation
         {
             if(s_macDeactivateWindow)
-                wxLogDebug("window=%p SHOULD have been deactivated, oh well!",s_macDeactivateWindow);
-            wxLogDebug("Scheduling delayed deactivation");
+                wxLogDebug(wxT("window=%p SHOULD have been deactivated, oh well!"),s_macDeactivateWindow);
+            wxLogDebug(wxT("Scheduling delayed deactivation"));
             s_macDeactivateWindow = this;
         }
     }
@@ -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;