X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..2db991f4576e7b08e4aa877c6350cca9656a60cc:/src/x11/pen.cpp?ds=sidebyside diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp index 4bc2b0bd89..339ef203f5 100644 --- a/src/x11/pen.cpp +++ b/src/x11/pen.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/motif/pen.cpp +// Name: src/x11/pen.cpp // Purpose: wxPen // Author: Julian Smart // Modified by: @@ -17,166 +17,191 @@ #include "wx/utils.h" #include "wx/pen.h" -IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) +//----------------------------------------------------------------------------- +// wxPen +//----------------------------------------------------------------------------- -wxPenRefData::wxPenRefData() +class wxPenRefData: public wxObjectRefData { - m_style = wxSOLID; - m_width = 1; - m_join = wxJOIN_ROUND ; - m_cap = wxCAP_ROUND ; - m_nbDash = 0 ; - m_dash = (wxMOTIFDash*)NULL; -} +public: + wxPenRefData() + { + m_width = 1; + m_style = wxSOLID; + m_joinStyle = wxJOIN_ROUND; + m_capStyle = wxCAP_ROUND; + m_dash = (wxX11Dash*) NULL; + m_countDashes = 0; + } + + wxPenRefData( const wxPenRefData& data ) + { + m_style = data.m_style; + m_width = data.m_width; + m_joinStyle = data.m_joinStyle; + m_capStyle = data.m_capStyle; + m_colour = data.m_colour; + m_countDashes = data.m_countDashes; +/* + if (data.m_dash) TODO + m_dash = new +*/ + m_dash = data.m_dash; + } -wxPenRefData::wxPenRefData(const wxPenRefData& data) -{ - m_style = data.m_style; - m_width = data.m_width; - m_join = data.m_join; - m_cap = data.m_cap; - m_nbDash = data.m_nbDash; - m_dash = data.m_dash; - m_colour = data.m_colour; -} + bool operator == (const wxPenRefData& data) const + { + return (m_style == data.m_style && + m_width == data.m_width && + m_joinStyle == data.m_joinStyle && + m_capStyle == data.m_capStyle && + m_colour == data.m_colour); + } + + int m_width; + int m_style; + int m_joinStyle; + int m_capStyle; + wxColour m_colour; + int m_countDashes; + wxX11Dash *m_dash; +}; -wxPenRefData::~wxPenRefData() -{ -} +//----------------------------------------------------------------------------- + +#define M_PENDATA ((wxPenRefData *)m_refData) -// Pens +IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject) -wxPen::wxPen() +wxPen::wxPen( const wxColour &colour, int width, int style ) { + m_refData = new wxPenRefData(); + M_PENDATA->m_width = width; + M_PENDATA->m_style = style; + M_PENDATA->m_colour = colour; } wxPen::~wxPen() { + // m_refData unrefed in ~wxObject } -// Should implement Create -wxPen::wxPen(const wxColour& col, int Width, int Style) +wxObjectRefData *wxPen::CreateRefData() const { - m_refData = new wxPenRefData; - - M_PENDATA->m_colour = col; - M_PENDATA->m_width = Width; - M_PENDATA->m_style = Style; - M_PENDATA->m_join = wxJOIN_ROUND ; - M_PENDATA->m_cap = wxCAP_ROUND ; - M_PENDATA->m_nbDash = 0 ; - M_PENDATA->m_dash = (wxMOTIFDash*)NULL; - - RealizeResource(); + return new wxPenRefData; } -wxPen::wxPen(const wxBitmap& stipple, int Width) +wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const { - m_refData = new wxPenRefData; - - M_PENDATA->m_stipple = stipple; - M_PENDATA->m_width = Width; - M_PENDATA->m_style = wxSTIPPLE; - M_PENDATA->m_join = wxJOIN_ROUND ; - M_PENDATA->m_cap = wxCAP_ROUND ; - M_PENDATA->m_nbDash = 0 ; - M_PENDATA->m_dash = (wxMOTIFDash*)NULL; - - RealizeResource(); + return new wxPenRefData(*(wxPenRefData *)data); } -void wxPen::Unshare() +bool wxPen::operator == ( const wxPen& pen ) const { - // Don't change shared data - if (!m_refData) - { - m_refData = new wxPenRefData(); - } - else - { - wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData); - UnRef(); - m_refData = ref; - } + if (m_refData == pen.m_refData) return TRUE; + + if (!m_refData || !pen.m_refData) return FALSE; + + return ( *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData ); } -void wxPen::SetColour(const wxColour& col) +void wxPen::SetColour( const wxColour &colour ) { - Unshare(); - - M_PENDATA->m_colour = col; - - RealizeResource(); + AllocExclusive(); + + M_PENDATA->m_colour = colour; } -void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b) +void wxPen::SetDashes( int number_of_dashes, const wxDash *dash ) { - Unshare(); - - M_PENDATA->m_colour.Set(r, g, b); + AllocExclusive(); + + M_PENDATA->m_countDashes = number_of_dashes; + M_PENDATA->m_dash = (wxX11Dash *)dash; // TODO +} - RealizeResource(); +void wxPen::SetColour( int red, int green, int blue ) +{ + AllocExclusive(); + + M_PENDATA->m_colour.Set( red, green, blue ); } -void wxPen::SetWidth(int Width) +void wxPen::SetCap( int capStyle ) { - Unshare(); + AllocExclusive(); + + M_PENDATA->m_capStyle = capStyle; +} - M_PENDATA->m_width = Width; +void wxPen::SetJoin( int joinStyle ) +{ + AllocExclusive(); + + M_PENDATA->m_joinStyle = joinStyle; +} - RealizeResource(); +void wxPen::SetStyle( int style ) +{ + AllocExclusive(); + + M_PENDATA->m_style = style; } -void wxPen::SetStyle(int Style) +void wxPen::SetWidth( int width ) { - Unshare(); + AllocExclusive(); + + M_PENDATA->m_width = width; +} - M_PENDATA->m_style = Style; +int wxPen::GetDashes( wxDash **ptr ) const +{ + *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); + return (M_PENDATA ? M_PENDATA->m_countDashes : 0); +} - RealizeResource(); +int wxPen::GetDashCount() const +{ + return (M_PENDATA->m_countDashes); } -void wxPen::SetStipple(const wxBitmap& Stipple) +wxDash* wxPen::GetDash() const { - Unshare(); + return (wxDash*)M_PENDATA->m_dash; +} - M_PENDATA->m_stipple = Stipple; - M_PENDATA->m_style = wxSTIPPLE; +int wxPen::GetCap() const +{ + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); - RealizeResource(); + return M_PENDATA->m_capStyle; } -void wxPen::SetDashes(int nb_dashes, const wxDash *Dash) +int wxPen::GetJoin() const { - Unshare(); + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); - M_PENDATA->m_nbDash = nb_dashes; - M_PENDATA->m_dash = (wxMOTIFDash *)Dash; - - RealizeResource(); + return M_PENDATA->m_joinStyle; } -void wxPen::SetJoin(int Join) +int wxPen::GetStyle() const { - Unshare(); - - M_PENDATA->m_join = Join; + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); - RealizeResource(); + return M_PENDATA->m_style; } -void wxPen::SetCap(int Cap) +int wxPen::GetWidth() const { - Unshare(); - - M_PENDATA->m_cap = Cap; + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); - RealizeResource(); + return M_PENDATA->m_width; } -bool wxPen::RealizeResource() +wxColour &wxPen::GetColour() const { - // Nothing more to do - return TRUE; -} + wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") ); + return M_PENDATA->m_colour; +}