X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2e57368359ab190b5bbad1849d88f298e30723c9..677dc0ed1a3ff68af15f6246d6d0708d5264b07a:/src/mac/carbon/brush.cpp?ds=inline diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp index b0fa74aa0a..3c91757ec9 100644 --- a/src/mac/carbon/brush.cpp +++ b/src/mac/carbon/brush.cpp @@ -23,7 +23,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject) class WXDLLEXPORT wxBrushRefData: public wxGDIRefData { - friend class WXDLLEXPORT wxBrush; + friend class wxBrush; public: wxBrushRefData(); @@ -33,7 +33,7 @@ public: bool operator == ( const wxBrushRefData& brush ) const { return m_style == brush.m_style && - m_stipple.IsRefTo(&brush.m_stipple) && + m_stipple.IsSameAs(brush.m_stipple) && m_colour == brush.m_colour && m_macBrushKind == brush.m_macBrushKind && m_macThemeBrush == brush.m_macThemeBrush && @@ -185,7 +185,7 @@ void wxBrush::MacSetTheme(ThemeBrush macThemeBrush) RGBColor color ; GetThemeBrushAsColor( macThemeBrush , 32, true, &color ); - M_BRUSHDATA->m_colour.Set( color.red >> 8 , color.green >> 8 , color.blue >> 8 ); + M_BRUSHDATA->m_colour = color; RealizeResource(); }