X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c89f5c02b1ecc6098b21b39b01509dd387c1cb34..20aeaa203c953fd988c4d266f1c955b5dd716810:/src/gtk1/brush.cpp diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp index c6b35cc4a2..392418c11e 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$ @@ -7,12 +7,15 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "brush.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/brush.h" +#ifndef WX_PRECOMP + #include "wx/colour.h" +#endif + #include //----------------------------------------------------------------------------- @@ -26,21 +29,22 @@ public: { m_style = 0; } - + wxBrushRefData( const wxBrushRefData& data ) + : wxObjectRefData() { m_style = data.m_style; 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; @@ -89,10 +93,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 ); } @@ -132,28 +136,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()) { @@ -164,4 +168,3 @@ void wxBrush::SetStipple( const wxBitmap& stipple ) M_BRUSHDATA->m_style = wxSTIPPLE; } } -