X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..60b0c3b4c64a768bedb48b00477b7f6290d9fe23:/src/gtk/brush.cpp diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp index f2237b0a66..4c54c10897 100644 --- a/src/gtk/brush.cpp +++ b/src/gtk/brush.cpp @@ -11,9 +11,11 @@ #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 @@ -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); } @@ -137,7 +139,7 @@ void wxBrush::SetColour( const wxColour& col ) M_BRUSHDATA->m_colour = 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();