X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55ccdb93e4ae4b606a4068cb37492c1ec3ed77a6..52af3158e974b042008474268570f3bdb7ce95ee:/src/mac/carbon/brush.cpp?ds=sidebyside diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp index c9dcbde97c..74e83ebd77 100644 --- a/src/mac/carbon/brush.cpp +++ b/src/mac/carbon/brush.cpp @@ -33,12 +33,12 @@ public: bool operator == ( const wxBrushRefData& brush ) const { return m_style == brush.m_style && - m_stipple.IsRefTo(&data.m_stipple) && + m_stipple.IsSameAs(brush.m_stipple) && m_colour == brush.m_colour && m_macBrushKind == brush.m_macBrushKind && m_macThemeBrush == brush.m_macThemeBrush && m_macThemeBackground == brush.m_macThemeBackground && - m_macThemeBackgroundExtent == brush.m_macThemeBackgroundExtent; + EqualRect(&m_macThemeBackgroundExtent, &brush.m_macThemeBackgroundExtent); } @@ -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(); }