X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..b976323b04593bf2f642d8bdf36b39a346d840dc:/src/gtk/brush.cpp diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp index f3278719ca..3d4549539f 100644 --- a/src/gtk/brush.cpp +++ b/src/gtk/brush.cpp @@ -26,7 +26,7 @@ public: { m_style = 0; } - + wxBrushRefData( const wxBrushRefData& data ) : wxObjectRefData() { @@ -34,14 +34,14 @@ public: m_stipple = data.m_stipple; m_colour = data.m_colour; } - + bool operator == (const wxBrushRefData& data) const { return (m_style == data.m_style && m_stipple == data.m_stipple && m_colour == data.m_colour); } - + int m_style; wxColour m_colour; wxBitmap m_stipple; @@ -90,10 +90,10 @@ wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const bool wxBrush::operator == ( const wxBrush& brush ) const { - if (m_refData == brush.m_refData) return TRUE; - - if (!m_refData || !brush.m_refData) return FALSE; - + if (m_refData == brush.m_refData) return true; + + if (!m_refData || !brush.m_refData) return false; + return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData ); } @@ -133,28 +133,28 @@ wxBitmap *wxBrush::GetStipple() const void wxBrush::SetColour( const wxColour& col ) { AllocExclusive(); - + M_BRUSHDATA->m_colour = col; } void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b ) { AllocExclusive(); - + M_BRUSHDATA->m_colour.Set( r, g, b ); } void wxBrush::SetStyle( int style ) { AllocExclusive(); - + M_BRUSHDATA->m_style = style; } void wxBrush::SetStipple( const wxBitmap& stipple ) { AllocExclusive(); - + M_BRUSHDATA->m_stipple = stipple; if (M_BRUSHDATA->m_stipple.GetMask()) { @@ -165,4 +165,3 @@ void wxBrush::SetStipple( const wxBitmap& stipple ) M_BRUSHDATA->m_style = wxSTIPPLE; } } -