X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/550343399aa1355469ffed72c8cf84c732dcf98b..9f400412e4cf9572ac5e07066e098a61fe5dbdc8:/src/x11/brush.cpp diff --git a/src/x11/brush.cpp b/src/x11/brush.cpp index 736dcc6cfd..7ac5842b35 100644 --- a/src/x11/brush.cpp +++ b/src/x11/brush.cpp @@ -12,16 +12,19 @@ // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/utils.h" #include "wx/brush.h" -#include "wx/bitmap.h" -#include "wx/colour.h" + +#ifndef WX_PRECOMP + #include "wx/utils.h" + #include "wx/bitmap.h" + #include "wx/colour.h" +#endif //----------------------------------------------------------------------------- // wxBrush //----------------------------------------------------------------------------- -class wxBrushRefData: public wxObjectRefData +class wxBrushRefData : public wxGDIRefData { public: wxBrushRefData() @@ -39,7 +42,7 @@ public: bool operator == (const wxBrushRefData& data) const { return (m_style == data.m_style && - m_stipple == data.m_stipple && + m_stipple.IsSameAs(data.m_stipple) && m_colour == data.m_colour); } @@ -79,12 +82,12 @@ wxBrush::~wxBrush() // m_refData unrefed in ~wxObject } -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); }