applied patch 1908782 wxAuiMDIChildFrame not removed from wxAuiMDIClientWindow

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

diff --git a/src/mac/carbon/drawer.cpp b/src/mac/carbon/drawer.cpp
index 0e77b2870220e4fb8a1d04cb5eb6b71da90138cb..4adb28e239137c342cb0562cd164bf27ffeea377 100644 (file)
--- a/src/mac/carbon/drawer.cpp
+++ b/src/mac/carbon/drawer.cpp
@@ -12,14 +12,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "control.h"
-#endif
+#include "wx/wxprec.h"
 
-#include "wx/defs.h"
 #include "wx/mac/private.h"
 
-#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
+#if defined( __WXMAC__ )
 
 #include "wx/mac/carbon/drawer.h"
 
@@ -75,16 +72,15 @@ bool wxDrawerWindow::Create(wxWindow *parent,
     bool success  = wxWindow::Create(parent, id, pos, dummySize, style, name);
     if (success)
     {
-        this->MacCreateRealWindow(title, pos, size, style, name);
+        this->MacCreateRealWindow(pos, size, style, name);
         success = (m_macWindow != NULL);
     }
     
     if (success)
     {
         // Use drawer brush.
-        m_macBackgroundBrush.MacSetTheme(kThemeBrushDrawerBackground);
-        ::SetThemeWindowBackground((WindowRef)m_macWindow,
-         m_macBackgroundBrush.MacGetTheme(), false);
+        SetBackgroundColour( wxColour( wxMacCreateCGColorFromHITheme( kThemeBrushDrawerBackground ) ) );
+        ::SetThemeWindowBackground((WindowRef)m_macWindow, kThemeBrushDrawerBackground, false);
          
         // Leading and trailing offset are gaps from parent window edges
         // to where the drawer starts.
@@ -200,5 +196,4 @@ wxDirection WindowEdgeToDirection(OptionBits edge)
     return direction;
 }
 
-#endif // defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
-
+#endif // defined( __WXMAC__ )