X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f96aa4d9eb296b3dfc468a351ce013bf92fab983..bf7945cef10c0844a32e95695c544d829da9293a:/src/gtk1/brush.cpp diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp index 698c499596..70a2790e4a 100644 --- a/src/gtk1/brush.cpp +++ b/src/gtk1/brush.cpp @@ -13,32 +13,33 @@ #include "wx/brush.h" +#include + //----------------------------------------------------------------------------- // wxBrush //----------------------------------------------------------------------------- class wxBrushRefData: public wxObjectRefData { - public: - - wxBrushRefData(void); +public: + wxBrushRefData(); wxBrushRefData( const wxBrushRefData& data ); - + int m_style; wxBitmap m_stipple; wxColour m_colour; }; -wxBrushRefData::wxBrushRefData(void) +wxBrushRefData::wxBrushRefData() { - m_style = 0; + m_style = 0; } wxBrushRefData::wxBrushRefData( const wxBrushRefData& data ) { - m_style = data.m_style; - m_stipple = data.m_stipple; - m_colour = data.m_colour; + m_style = data.m_style; + m_stipple = data.m_stipple; + m_colour = data.m_colour; } //----------------------------------------------------------------------------- @@ -47,139 +48,145 @@ wxBrushRefData::wxBrushRefData( const wxBrushRefData& data ) IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject) -wxBrush::wxBrush(void) +wxBrush::wxBrush() { - if (wxTheBrushList) wxTheBrushList->AddBrush( this ); + 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; + + if (wxTheBrushList) wxTheBrushList->AddBrush( this ); } 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; + + 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 ); - - if (wxTheBrushList) wxTheBrushList->AddBrush( this ); -} + Ref( brush ); -wxBrush::wxBrush( const wxBrush *brush ) -{ - if (brush) Ref( *brush ); - - if (wxTheBrushList) wxTheBrushList->Append( this ); + if (wxTheBrushList) wxTheBrushList->AddBrush( this ); } -wxBrush::~wxBrush(void) +wxBrush::~wxBrush() { - if (wxTheBrushList) wxTheBrushList->RemoveBrush( this ); + if (wxTheBrushList) wxTheBrushList->RemoveBrush( this ); } wxBrush& wxBrush::operator = ( const wxBrush& brush ) { - if (*this == brush) return (*this); - Ref( brush ); - return *this; + if (*this == brush) return (*this); + Ref( brush ); + return *this; } - -bool wxBrush::operator == ( const wxBrush& brush ) + +bool wxBrush::operator == ( const wxBrush& brush ) const { - return m_refData == brush.m_refData; + return m_refData == brush.m_refData; } -bool wxBrush::operator != ( const wxBrush& brush ) +bool wxBrush::operator != ( const wxBrush& brush ) const { - return m_refData != brush.m_refData; + return m_refData != brush.m_refData; } -bool wxBrush::Ok(void) const +bool wxBrush::Ok() const { - return ((m_refData) && M_BRUSHDATA->m_colour.Ok()); + return ((m_refData) && M_BRUSHDATA->m_colour.Ok()); } -int wxBrush::GetStyle(void) const +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(void) const +wxColour &wxBrush::GetColour() const { - if (m_refData == NULL) - { - wxFAIL_MSG( "invalid brush" ); - return wxNullColour; - } - - return M_BRUSHDATA->m_colour; + if (m_refData == NULL) + { + wxFAIL_MSG( wxT("invalid brush") ); + return wxNullColour; + } + + return M_BRUSHDATA->m_colour; } -wxBitmap *wxBrush::GetStipple(void) const +wxBitmap *wxBrush::GetStipple() const { - if (m_refData == NULL) - { - wxFAIL_MSG( "invalid brush" ); - return &wxNullBitmap; - } - - return &M_BRUSHDATA->m_stipple; + if (m_refData == NULL) + { + wxFAIL_MSG( wxT("invalid brush") ); + return &wxNullBitmap; + } + + return &M_BRUSHDATA->m_stipple; } void wxBrush::SetColour( const wxColour& col ) { - Unshare(); - M_BRUSHDATA->m_colour = col; + Unshare(); + 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 ); + Unshare(); + M_BRUSHDATA->m_colour.Set( r, g, b ); } void wxBrush::SetStyle( int style ) { - Unshare(); - M_BRUSHDATA->m_style = style; + Unshare(); + M_BRUSHDATA->m_style = style; } void wxBrush::SetStipple( const wxBitmap& stipple ) { - Unshare(); - M_BRUSHDATA->m_stipple = stipple; -} - -void wxBrush::Unshare(void) -{ - if (!m_refData) - { - m_refData = new wxBrushRefData(); - } - else - { - wxBrushRefData* ref = new wxBrushRefData( *(wxBrushRefData*)m_refData ); - UnRef(); - m_refData = ref; - } + Unshare(); + 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(); + } + else + { + wxBrushRefData* ref = new wxBrushRefData( *(wxBrushRefData*)m_refData ); + UnRef(); + m_refData = ref; + } }