X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..fa03793d3bf2b76a753483ddf12abfd35eebe7a0:/src/gtk1/brush.cpp diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp index 155b0c400b..c6b35cc4a2 100644 --- a/src/gtk1/brush.cpp +++ b/src/gtk1/brush.cpp @@ -1,11 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: brush.cpp +// Name: src/gtk/brush.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -14,24 +13,37 @@ #include "wx/brush.h" +#include <gdk/gdk.h> + //----------------------------------------------------------------------------- // wxBrush //----------------------------------------------------------------------------- class wxBrushRefData: public wxObjectRefData { - public: - - wxBrushRefData(void); - - int m_style; - wxBitmap m_stipple; - wxColour m_colour; -}; - -wxBrushRefData::wxBrushRefData(void) -{ - m_style = 0; +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; }; //----------------------------------------------------------------------------- @@ -40,93 +52,116 @@ wxBrushRefData::wxBrushRefData(void) IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject) -wxBrush::wxBrush(void) -{ - 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 wxString &colourName, int style ) -{ - m_refData = new wxBrushRefData(); - M_BRUSHDATA->m_style = style; - M_BRUSHDATA->m_colour = colourName; - - 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 ) + M_BRUSHDATA->m_stipple = stippleBitmap; + + if (M_BRUSHDATA->m_stipple.GetMask()) + M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE; + else + M_BRUSHDATA->m_style = wxSTIPPLE; +} + +wxBrush::~wxBrush() { - Ref( brush ); - - if (wxTheBrushList) wxTheBrushList->AddBrush( this ); -}; + // m_refData unrefed in ~wxObject +} -wxBrush::wxBrush( const wxBrush *brush ) +wxObjectRefData *wxBrush::CreateRefData() const { - if (brush) Ref( *brush ); - - if (wxTheBrushList) wxTheBrushList->Append( this ); -}; + return new wxBrushRefData; +} -wxBrush::~wxBrush(void) +wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const { - if (wxTheBrushList) wxTheBrushList->RemoveBrush( this ); -}; + return new wxBrushRefData(*(wxBrushRefData *)data); +} -wxBrush& wxBrush::operator = ( const wxBrush& brush ) +bool wxBrush::operator == ( const wxBrush& brush ) const { - if (*this == brush) return (*this); - Ref( brush ); - return *this; -}; - -bool wxBrush::operator == ( const wxBrush& brush ) + 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 { - return m_refData == brush.m_refData; -}; + if (m_refData == NULL) + { + wxFAIL_MSG( wxT("invalid brush") ); + return 0; + } + + return M_BRUSHDATA->m_style; +} -bool wxBrush::operator != ( const wxBrush& brush ) +wxColour &wxBrush::GetColour() const { - return m_refData != brush.m_refData; -}; + if (m_refData == NULL) + { + wxFAIL_MSG( wxT("invalid brush") ); + return wxNullColour; + } -bool wxBrush::Ok(void) const + return M_BRUSHDATA->m_colour; +} + +wxBitmap *wxBrush::GetStipple() const { - return ((m_refData) && M_BRUSHDATA->m_colour.Ok()); -}; + if (m_refData == NULL) + { + wxFAIL_MSG( wxT("invalid brush") ); + return &wxNullBitmap; + } -int wxBrush::GetStyle(void) const + return &M_BRUSHDATA->m_stipple; +} + +void wxBrush::SetColour( const wxColour& col ) { - return M_BRUSHDATA->m_style; -}; + AllocExclusive(); + + M_BRUSHDATA->m_colour = col; +} -wxColour &wxBrush::GetColour(void) const +void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b ) { - return M_BRUSHDATA->m_colour; -}; + AllocExclusive(); + + M_BRUSHDATA->m_colour.Set( r, g, b ); +} -wxBitmap *wxBrush::GetStipple(void) const +void wxBrush::SetStyle( int style ) { - return &M_BRUSHDATA->m_stipple; -}; + AllocExclusive(); + + M_BRUSHDATA->m_style = style; +} +void wxBrush::SetStipple( const wxBitmap& stipple ) +{ + 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; + } +}