X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a1498c08b07625baa087622e75637a2f15325b6..e3041f4af06d127021c568c39783279b8d0bea75:/src/gtk/brush.cpp?ds=sidebyside diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp index 3d4549539f..0106125d9a 100644 --- a/src/gtk/brush.cpp +++ b/src/gtk/brush.cpp @@ -11,15 +11,17 @@ #include "wx/wxprec.h" #include "wx/brush.h" -#include "wx/colour.h" -#include +#ifndef WX_PRECOMP + #include "wx/bitmap.h" + #include "wx/colour.h" +#endif //----------------------------------------------------------------------------- // wxBrush //----------------------------------------------------------------------------- -class wxBrushRefData: public wxObjectRefData +class wxBrushRefData: public wxGDIRefData { public: wxBrushRefData() @@ -28,7 +30,7 @@ public: } wxBrushRefData( const wxBrushRefData& data ) - : wxObjectRefData() + : wxGDIRefData() { m_style = data.m_style; m_stipple = data.m_stipple; @@ -38,7 +40,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); } @@ -78,17 +80,17 @@ 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); } -bool wxBrush::operator == ( const wxBrush& brush ) const +bool wxBrush::operator==(const wxBrush& brush) const { if (m_refData == brush.m_refData) return true;