X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/449c567346a1b3937e532cd87aac007faad76b04..a0f4d36895556e3054e2256cb5f1787cc9fcf75c:/src/cocoa/brush.mm?ds=sidebyside diff --git a/src/cocoa/brush.mm b/src/cocoa/brush.mm index c58fd7604b..6a1bce5e7f 100644 --- a/src/cocoa/brush.mm +++ b/src/cocoa/brush.mm @@ -6,15 +6,17 @@ // Created: 2003/07/03 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #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) @@ -157,12 +159,12 @@ wxBrush::wxBrush(const wxBitmap& stipple) m_refData = new wxBrushRefData(stipple); } -wxObjectRefData *wxBrush::CreateRefData() const +wxGDIRefData *wxBrush::CreateGDIRefData() const { return new wxBrushRefData; } -wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const +wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const { return new wxBrushRefData(*(wxBrushRefData *)data); } @@ -215,4 +217,3 @@ WX_NSColor wxBrush::GetNSColor() return [NSColor clearColor]; return M_BRUSHDATA->GetNSColor(); } -