Patch from Hartwig and me for implementing reorderable dataview columns. Works on...

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

diff --git a/src/mac/carbon/drawer.cpp b/src/mac/carbon/drawer.cpp
index bcf8785ca2e19c97710dcfb8af8d671c761ca871..2c02dd42601c54db84d1f35a3d0e5b11a2d89027 100644 (file)
--- a/src/mac/carbon/drawer.cpp
+++ b/src/mac/carbon/drawer.cpp
@@ -12,15 +12,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "control.h"
-#endif
-
 #include "wx/wxprec.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"
 
@@ -83,9 +79,8 @@ bool wxDrawerWindow::Create(wxWindow *parent,
     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.
@@ -201,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__ )