X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..abb6edd197b78d24f762257a7880539556d10505:/src/x11/brush.cpp diff --git a/src/x11/brush.cpp b/src/x11/brush.cpp index a239850cca..3eeb858046 100644 --- a/src/x11/brush.cpp +++ b/src/x11/brush.cpp @@ -12,10 +12,13 @@ // 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 @@ -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); } @@ -138,7 +141,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();