X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83624f79609f0d5e240c1f7d77d044bfff9702fc..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/gtk1/brush.cpp diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp index be6d5e2e91..c6b35cc4a2 100644 --- a/src/gtk1/brush.cpp +++ b/src/gtk1/brush.cpp @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// 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__ @@ -13,7 +13,7 @@ #include "wx/brush.h" -#include "gdk/gdk.h" +#include //----------------------------------------------------------------------------- // wxBrush @@ -21,160 +21,147 @@ class wxBrushRefData: public wxObjectRefData { - public: - - wxBrushRefData(); - wxBrushRefData( const wxBrushRefData& data ); - - int m_style; - wxBitmap m_stipple; - wxColour m_colour; +public: + 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() -{ - 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 ); + m_refData = new wxBrushRefData(); + M_BRUSHDATA->m_style = style; + M_BRUSHDATA->m_colour = colour; } wxBrush::wxBrush( const wxBitmap &stippleBitmap ) { - m_refData = new wxBrushRefData(); - M_BRUSHDATA->m_style = wxSTIPPLE; - M_BRUSHDATA->m_colour = *wxBLACK; - M_BRUSHDATA->m_stipple = stippleBitmap; - - if (wxTheBrushList) wxTheBrushList->AddBrush( this ); -} + m_refData = new wxBrushRefData(); + M_BRUSHDATA->m_colour = *wxBLACK; -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 ); -} - -wxBrush& wxBrush::operator = ( const wxBrush& brush ) -{ - if (*this == brush) return (*this); - Ref( brush ); - return *this; + // m_refData unrefed in ~wxObject } -bool wxBrush::operator == ( const wxBrush& brush ) +wxObjectRefData *wxBrush::CreateRefData() const { - return m_refData == brush.m_refData; + return new wxBrushRefData; } -bool wxBrush::operator != ( const wxBrush& brush ) +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 { - if (m_refData == NULL) - { - wxFAIL_MSG( "invalid brush" ); - return 0; - } + if (m_refData == NULL) + { + wxFAIL_MSG( wxT("invalid brush") ); + return 0; + } - return M_BRUSHDATA->m_style; + return M_BRUSHDATA->m_style; } wxColour &wxBrush::GetColour() const { - if (m_refData == NULL) - { - wxFAIL_MSG( "invalid brush" ); - return wxNullColour; - } + if (m_refData == NULL) + { + wxFAIL_MSG( wxT("invalid brush") ); + return wxNullColour; + } - return M_BRUSHDATA->m_colour; + return M_BRUSHDATA->m_colour; } wxBitmap *wxBrush::GetStipple() const { - if (m_refData == NULL) - { - wxFAIL_MSG( "invalid brush" ); - return &wxNullBitmap; - } + if (m_refData == NULL) + { + wxFAIL_MSG( wxT("invalid brush") ); + return &wxNullBitmap; + } - return &M_BRUSHDATA->m_stipple; + return &M_BRUSHDATA->m_stipple; } void wxBrush::SetColour( const wxColour& col ) { - Unshare(); - M_BRUSHDATA->m_colour = col; + AllocExclusive(); + + M_BRUSHDATA->m_colour = col; } void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b ) { - Unshare(); - M_BRUSHDATA->m_colour.Set( r, g, b ); + AllocExclusive(); + + M_BRUSHDATA->m_colour.Set( r, g, b ); } void wxBrush::SetStyle( int style ) { - Unshare(); - M_BRUSHDATA->m_style = style; + AllocExclusive(); + + M_BRUSHDATA->m_style = style; } void wxBrush::SetStipple( const wxBitmap& stipple ) { - Unshare(); - M_BRUSHDATA->m_stipple = stipple; -} - -void wxBrush::Unshare() -{ - if (!m_refData) - { - m_refData = new wxBrushRefData(); - } - else - { - wxBrushRefData* ref = new wxBrushRefData( *(wxBrushRefData*)m_refData ); - UnRef(); - m_refData = ref; - } + 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; + } }