X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/facd6764872eede45605ba7c9dfa0e1d0c708fa2..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/mac/carbon/brush.cpp diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp index f94401052f..789be90f00 100644 --- a/src/mac/carbon/brush.cpp +++ b/src/mac/carbon/brush.cpp @@ -9,11 +9,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "brush.h" #endif -#include "wx/setup.h" +#include "wx/wxprec.h" + #include "wx/utils.h" #include "wx/brush.h" @@ -170,7 +171,10 @@ void wxBrush::MacSetTheme(ThemeBrush macThemeBrush) M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme; M_BRUSHDATA->m_macThemeBrush = macThemeBrush; - + RGBColor color ; + GetThemeBrushAsColor( macThemeBrush , 32, true, &color ); + M_BRUSHDATA->m_colour.Set( color.red >> 8 , color.green >> 8 , color.blue >> 8 ) ; + RealizeResource(); } @@ -226,4 +230,4 @@ wxBitmap *wxBrush::GetStipple() const wxMacBrushKind wxBrush::MacGetBrushKind() const { return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour); -} \ No newline at end of file +}