X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..3be926e348e2d0a3a2c278b9f2cff7843971e0c9:/src/cocoa/brush.mm diff --git a/src/cocoa/brush.mm b/src/cocoa/brush.mm index eeafeff7e8..eef0553a90 100644 --- a/src/cocoa/brush.mm +++ b/src/cocoa/brush.mm @@ -10,11 +10,13 @@ ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + +#include "wx/brush.h" + #ifndef WX_PRECOMP #include "wx/utils.h" - #include "wx/brush.h" + #include "wx/colour.h" #endif //WX_PRECOMP -#include "wx/colour.h" #import @@ -94,7 +96,7 @@ bool wxBrushRefData::operator==(const wxBrushRefData& data) const // don't compare our NSColor return m_style == data.m_style && m_colour == data.m_colour && - m_stipple == data.m_stipple; + m_stipple.IsSameAs(data.m_stipple); } void wxBrushRefData::DoSetStipple(const wxBitmap& stipple) @@ -173,7 +175,7 @@ void wxBrush::SetColour(const wxColour& col) M_BRUSHDATA->SetColour(col); } -void wxBrush::SetColour(const unsigned char r, const unsigned char g, const unsigned char b) +void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b) { AllocExclusive(); M_BRUSHDATA->SetColour(wxColour(r,g,b));