X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ecb8b06ade47981aa828a3f7fb4278f822456d3..cd5e9298159e58f57e05f3b76c9d4a45e1eefe12:/src/gtk1/brush.cpp diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp index 68d4d985f9..c6b35cc4a2 100644 --- a/src/gtk1/brush.cpp +++ b/src/gtk1/brush.cpp @@ -22,36 +22,36 @@ class wxBrushRefData: public wxObjectRefData { public: - wxBrushRefData(); - wxBrushRefData( const wxBrushRefData& data ); - - int m_style; - wxBitmap m_stipple; - wxColour m_colour; + wxBrushRefData() + { + m_style = 0; + } + + wxBrushRefData( const wxBrushRefData& data ) + { + 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; }; -wxBrushRefData::wxBrushRefData() -{ - m_style = 0; -} - -wxBrushRefData::wxBrushRefData( const wxBrushRefData& data ) -{ - m_style = data.m_style; - m_stipple = data.m_stipple; - m_colour = data.m_colour; -} - //----------------------------------------------------------------------------- #define M_BRUSHDATA ((wxBrushRefData *)m_refData) IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject) -wxBrush::wxBrush() -{ -} - wxBrush::wxBrush( const wxColour &colour, int style ) { m_refData = new wxBrushRefData(); @@ -72,36 +72,28 @@ wxBrush::wxBrush( const wxBitmap &stippleBitmap ) M_BRUSHDATA->m_style = wxSTIPPLE; } -wxBrush::wxBrush( const wxBrush &brush ) -{ - Ref( brush ); -} - wxBrush::~wxBrush() { + // m_refData unrefed in ~wxObject } -wxBrush& wxBrush::operator = ( const wxBrush& brush ) -{ - if ( m_refData != brush.m_refData ) - Ref( brush ); - - return *this; -} - -bool wxBrush::operator == ( const wxBrush& brush ) const +wxObjectRefData *wxBrush::CreateRefData() const { - return m_refData == brush.m_refData; + return new wxBrushRefData; } -bool wxBrush::operator != ( const wxBrush& brush ) const +wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const { - return m_refData != brush.m_refData; + return new wxBrushRefData(*(wxBrushRefData *)data); } -bool wxBrush::Ok() const +bool wxBrush::operator == ( const wxBrush& brush ) const { - return ((m_refData) && M_BRUSHDATA->m_colour.Ok()); + if (m_refData == brush.m_refData) return TRUE; + + if (!m_refData || !brush.m_refData) return FALSE; + + return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData ); } int wxBrush::GetStyle() const @@ -139,25 +131,29 @@ wxBitmap *wxBrush::GetStipple() const void wxBrush::SetColour( const wxColour& col ) { - Unshare(); + AllocExclusive(); + M_BRUSHDATA->m_colour = col; } void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b ) { - Unshare(); + AllocExclusive(); + M_BRUSHDATA->m_colour.Set( r, g, b ); } void wxBrush::SetStyle( int style ) { - Unshare(); + AllocExclusive(); + M_BRUSHDATA->m_style = style; } void wxBrush::SetStipple( const wxBitmap& stipple ) { - Unshare(); + AllocExclusive(); + M_BRUSHDATA->m_stipple = stipple; if (M_BRUSHDATA->m_stipple.GetMask()) { @@ -169,17 +165,3 @@ void wxBrush::SetStipple( const wxBitmap& stipple ) } } -void wxBrush::Unshare() -{ - if (!m_refData) - { - m_refData = new wxBrushRefData(); - } - else - { - wxBrushRefData* ref = new wxBrushRefData( *(wxBrushRefData*)m_refData ); - UnRef(); - m_refData = ref; - } -} -