X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4ac48ae21050f6540abd57c26ff1aa254f9e0354..8064223b7b1b3657363b7a635c381b9269d95e55:/src/mac/carbon/drawer.cpp?ds=inline diff --git a/src/mac/carbon/drawer.cpp b/src/mac/carbon/drawer.cpp index 0e77b28702..2c02dd4260 100644 --- 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" @@ -82,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. @@ -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__ )