X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..efb35bebfacaffbf68123be0bff79d7bf0d2dee2:/src/gtk1/brush.cpp diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp index f2237b0a66..3b9330bb1a 100644 --- a/src/gtk1/brush.cpp +++ b/src/gtk1/brush.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/brush.cpp +// Name: src/gtk1/brush.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -11,7 +11,10 @@ #include "wx/wxprec.h" #include "wx/brush.h" -#include "wx/colour.h" + +#ifndef WX_PRECOMP + #include "wx/colour.h" +#endif #include @@ -38,7 +41,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 +140,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();