X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..204abcd474fa99071b7bb5b00f7e212b0bde16dc:/src/mac/carbon/drawer.cpp?ds=sidebyside diff --git a/src/mac/carbon/drawer.cpp b/src/mac/carbon/drawer.cpp index 605aad98ab..2c02dd4260 100644 --- a/src/mac/carbon/drawer.cpp +++ b/src/mac/carbon/drawer.cpp @@ -16,7 +16,7 @@ #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" @@ -79,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. @@ -197,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__ )