X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ecb8b06ade47981aa828a3f7fb4278f822456d3..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/gtk/brush.cpp diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp index 68d4d985f9..4c54c10897 100644 --- a/src/gtk/brush.cpp +++ b/src/gtk/brush.cpp @@ -7,13 +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" -#include +#ifndef WX_PRECOMP + #include "wx/bitmap.h" + #include "wx/colour.h" +#endif //----------------------------------------------------------------------------- // wxBrush @@ -22,25 +24,30 @@ class wxBrushRefData: public wxObjectRefData { public: - wxBrushRefData(); - wxBrushRefData( const wxBrushRefData& data ); + wxBrushRefData() + { + m_style = 0; + } - int m_style; - wxBitmap m_stipple; - wxColour m_colour; -}; + wxBrushRefData( const wxBrushRefData& data ) + : wxObjectRefData() + { + m_style = data.m_style; + m_stipple = data.m_stipple; + m_colour = data.m_colour; + } -wxBrushRefData::wxBrushRefData() -{ - m_style = 0; -} + bool operator == (const wxBrushRefData& data) const + { + return (m_style == data.m_style && + m_stipple.IsSameAs(data.m_stipple) && + m_colour == data.m_colour); + } -wxBrushRefData::wxBrushRefData( const wxBrushRefData& data ) -{ - m_style = data.m_style; - m_stipple = data.m_stipple; - m_colour = data.m_colour; -} + int m_style; + wxColour m_colour; + wxBitmap m_stipple; +}; //----------------------------------------------------------------------------- @@ -48,10 +55,6 @@ wxBrushRefData::wxBrushRefData( const wxBrushRefData& data ) IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject) -wxBrush::wxBrush() -{ -} - wxBrush::wxBrush( const wxColour &colour, int style ) { m_refData = new wxBrushRefData(); @@ -72,36 +75,28 @@ wxBrush::wxBrush( const wxBitmap &stippleBitmap ) M_BRUSHDATA->m_style = wxSTIPPLE; } -wxBrush::wxBrush( const wxBrush &brush ) +wxBrush::~wxBrush() { - Ref( brush ); + // m_refData unrefed in ~wxObject } -wxBrush::~wxBrush() +wxObjectRefData *wxBrush::CreateRefData() const { + return new wxBrushRefData; } -wxBrush& wxBrush::operator = ( const wxBrush& brush ) +wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const { - if ( m_refData != brush.m_refData ) - Ref( brush ); - - return *this; + return new wxBrushRefData(*(wxBrushRefData *)data); } bool wxBrush::operator == ( const wxBrush& brush ) const { - return m_refData == brush.m_refData; -} + if (m_refData == brush.m_refData) return true; -bool wxBrush::operator != ( const wxBrush& brush ) const -{ - return m_refData != brush.m_refData; -} + if (!m_refData || !brush.m_refData) return false; -bool wxBrush::Ok() const -{ - return ((m_refData) && M_BRUSHDATA->m_colour.Ok()); + return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData ); } int wxBrush::GetStyle() const @@ -139,25 +134,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()) { @@ -168,18 +167,3 @@ void wxBrush::SetStipple( const wxBitmap& stipple ) M_BRUSHDATA->m_style = wxSTIPPLE; } } - -void wxBrush::Unshare() -{ - if (!m_refData) - { - m_refData = new wxBrushRefData(); - } - else - { - wxBrushRefData* ref = new wxBrushRefData( *(wxBrushRefData*)m_refData ); - UnRef(); - m_refData = ref; - } -} -