X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de2d2cdc86590c07642994e58051b94ab356256d..24377c46813426a325a209c45bbca0a9e8da054b:/src/gtk/brush.cpp diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp index ca0987080c..0106125d9a 100644 --- a/src/gtk/brush.cpp +++ b/src/gtk/brush.cpp @@ -1,46 +1,53 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: brush.cpp +// Name: src/gtk/brush.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// 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 //----------------------------------------------------------------------------- -class wxBrushRefData: public wxObjectRefData +class wxBrushRefData: public wxGDIRefData { public: - wxBrushRefData(); - wxBrushRefData( const wxBrushRefData& data ); + wxBrushRefData() + { + m_style = 0; + } - int m_style; - wxBitmap m_stipple; - wxColour m_colour; -}; + wxBrushRefData( const wxBrushRefData& data ) + : wxGDIRefData() + { + 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,69 +55,48 @@ wxBrushRefData::wxBrushRefData( const wxBrushRefData& data ) IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject) -wxBrush::wxBrush() -{ - if (wxTheBrushList) wxTheBrushList->AddBrush( this ); -} - wxBrush::wxBrush( const wxColour &colour, int style ) { m_refData = new wxBrushRefData(); M_BRUSHDATA->m_style = style; M_BRUSHDATA->m_colour = colour; - - if (wxTheBrushList) wxTheBrushList->AddBrush( this ); } wxBrush::wxBrush( const wxBitmap &stippleBitmap ) { m_refData = new wxBrushRefData(); M_BRUSHDATA->m_colour = *wxBLACK; - M_BRUSHDATA->m_stipple = stippleBitmap; - if (M_BRUSHDATA->m_stipple.GetMask()) - { - M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE; - } - else - { - M_BRUSHDATA->m_style = wxSTIPPLE; - } - - if (wxTheBrushList) wxTheBrushList->AddBrush( this ); -} -wxBrush::wxBrush( const wxBrush &brush ) -{ - Ref( brush ); + M_BRUSHDATA->m_stipple = stippleBitmap; - if (wxTheBrushList) wxTheBrushList->AddBrush( this ); + if (M_BRUSHDATA->m_stipple.GetMask()) + M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE; + else + M_BRUSHDATA->m_style = wxSTIPPLE; } wxBrush::~wxBrush() { - if (wxTheBrushList) wxTheBrushList->RemoveBrush( this ); + // m_refData unrefed in ~wxObject } -wxBrush& wxBrush::operator = ( const wxBrush& brush ) +wxGDIRefData *wxBrush::CreateGDIRefData() const { - if (*this == brush) return (*this); - Ref( brush ); - return *this; + return new wxBrushRefData; } -bool wxBrush::operator == ( const wxBrush& brush ) +wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const { - return m_refData == brush.m_refData; + return new wxBrushRefData(*(wxBrushRefData *)data); } -bool wxBrush::operator != ( const wxBrush& brush ) +bool wxBrush::operator==(const wxBrush& brush) const { - return m_refData != brush.m_refData; -} + if (m_refData == brush.m_refData) return true; -bool wxBrush::Ok() const -{ - return ((m_refData) && M_BRUSHDATA->m_colour.Ok()); + if (!m_refData || !brush.m_refData) return false; + + return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData ); } int wxBrush::GetStyle() const @@ -148,47 +134,36 @@ 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()) { - M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE; - } - else - { - M_BRUSHDATA->m_style = wxSTIPPLE; - } -} - -void wxBrush::Unshare() -{ - if (!m_refData) - { - m_refData = new wxBrushRefData(); + M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE; } else { - wxBrushRefData* ref = new wxBrushRefData( *(wxBrushRefData*)m_refData ); - UnRef(); - m_refData = ref; + M_BRUSHDATA->m_style = wxSTIPPLE; } } -