X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..f050bdbd5b69ed1a6752102f0c4c13bc7cb4ed3c:/src/x11/brush.cpp?ds=sidebyside diff --git a/src/x11/brush.cpp b/src/x11/brush.cpp index a239850cca..25192ebb53 100644 --- a/src/x11/brush.cpp +++ b/src/x11/brush.cpp @@ -12,21 +12,24 @@ // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/utils.h" #include "wx/brush.h" -#include "wx/bitmap.h" -#include "wx/colour.h" + +#ifndef WX_PRECOMP + #include "wx/utils.h" + #include "wx/bitmap.h" + #include "wx/colour.h" +#endif //----------------------------------------------------------------------------- // wxBrush //----------------------------------------------------------------------------- -class wxBrushRefData: public wxObjectRefData +class wxBrushRefData : public wxGDIRefData { public: wxBrushRefData() { - m_style = 0; + m_style = wxBRUSHSTYLE_INVALID; } wxBrushRefData( const wxBrushRefData& data ) @@ -39,13 +42,13 @@ public: 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; }; //----------------------------------------------------------------------------- @@ -54,13 +57,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(); @@ -69,9 +81,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() @@ -79,12 +91,12 @@ 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); } @@ -98,35 +110,23 @@ bool wxBrush::operator == ( const wxBrush& brush ) const 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; } @@ -138,14 +138,14 @@ void wxBrush::SetColour( const wxColour& col ) M_BRUSHDATA->m_colour = col; } -void wxBrush::SetColour( const unsigned char r, const unsigned char g, const unsigned char b ) +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(); @@ -158,11 +158,7 @@ void wxBrush::SetStipple( const wxBitmap& stipple ) 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; }