X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..2028c33ab5a39a12bd410ac953731a56ad6377ba:/src/gtk1/brush.cpp?ds=sidebyside diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp index f3278719ca..d38da098ab 100644 --- a/src/gtk1/brush.cpp +++ b/src/gtk1/brush.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/brush.cpp +// Name: src/gtk1/brush.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -11,7 +11,10 @@ #include "wx/wxprec.h" #include "wx/brush.h" -#include "wx/colour.h" + +#ifndef WX_PRECOMP + #include "wx/colour.h" +#endif #include @@ -19,32 +22,32 @@ // wxBrush //----------------------------------------------------------------------------- -class wxBrushRefData: public wxObjectRefData +class wxBrushRefData: public wxGDIRefData { public: wxBrushRefData() { - m_style = 0; + m_style = wxBRUSHSTYLE_INVALID; } - + wxBrushRefData( const wxBrushRefData& data ) - : wxObjectRefData() + : wxGDIRefData() { 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_stipple.IsSameAs(data.m_stipple) && m_colour == data.m_colour); } - - int m_style; - wxColour m_colour; - wxBitmap m_stipple; + + wxBrushStyle m_style; + wxColour m_colour; + wxBitmap m_stipple; }; //----------------------------------------------------------------------------- @@ -53,13 +56,22 @@ public: IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject) -wxBrush::wxBrush( const wxColour &colour, int style ) +wxBrush::wxBrush( const wxColour &colour, wxBrushStyle style ) { m_refData = new wxBrushRefData(); M_BRUSHDATA->m_style = style; M_BRUSHDATA->m_colour = colour; } +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxBrush::wxBrush(const wxColour& col, int style) +{ + m_refData = new wxBrushRefData; + M_BRUSHDATA->m_style = (wxBrushStyle)style; + M_BRUSHDATA->m_colour = col; +} +#endif + wxBrush::wxBrush( const wxBitmap &stippleBitmap ) { m_refData = new wxBrushRefData(); @@ -68,9 +80,9 @@ wxBrush::wxBrush( const wxBitmap &stippleBitmap ) M_BRUSHDATA->m_stipple = stippleBitmap; if (M_BRUSHDATA->m_stipple.GetMask()) - M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE; + M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE; else - M_BRUSHDATA->m_style = wxSTIPPLE; + M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK; } wxBrush::~wxBrush() @@ -78,54 +90,42 @@ wxBrush::~wxBrush() // m_refData unrefed in ~wxObject } -wxObjectRefData *wxBrush::CreateRefData() const +wxGDIRefData *wxBrush::CreateGDIRefData() const { return new wxBrushRefData; } -wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const +wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const { return new wxBrushRefData(*(wxBrushRefData *)data); } bool wxBrush::operator == ( const wxBrush& brush ) const { - if (m_refData == brush.m_refData) return TRUE; - - if (!m_refData || !brush.m_refData) return FALSE; - + 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 +wxBrushStyle wxBrush::GetStyle() const { - if (m_refData == NULL) - { - wxFAIL_MSG( wxT("invalid brush") ); - return 0; - } + wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); return M_BRUSHDATA->m_style; } -wxColour &wxBrush::GetColour() const +wxColour wxBrush::GetColour() const { - if (m_refData == NULL) - { - wxFAIL_MSG( wxT("invalid brush") ); - return wxNullColour; - } + wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") ); return M_BRUSHDATA->m_colour; } wxBitmap *wxBrush::GetStipple() const { - if (m_refData == NULL) - { - wxFAIL_MSG( wxT("invalid brush") ); - return &wxNullBitmap; - } + wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") ); return &M_BRUSHDATA->m_stipple; } @@ -133,36 +133,31 @@ wxBitmap *wxBrush::GetStipple() const void wxBrush::SetColour( const wxColour& col ) { AllocExclusive(); - + M_BRUSHDATA->m_colour = col; } void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b ) { AllocExclusive(); - + M_BRUSHDATA->m_colour.Set( r, g, b ); } -void wxBrush::SetStyle( int style ) +void wxBrush::SetStyle( wxBrushStyle style ) { 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; - } + M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE; else - { - M_BRUSHDATA->m_style = wxSTIPPLE; - } + M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK; } -