X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..e66474166b164b9e11f9881e79d531bc5182ea31:/src/gtk/pen.cpp diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp index 7ed7be02a7..1e2205e78d 100644 --- a/src/gtk/pen.cpp +++ b/src/gtk/pen.cpp @@ -2,10 +2,9 @@ // Name: pen.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 ///////////////////////////////////////////////////////////////////////////// @@ -15,30 +14,42 @@ #include "wx/pen.h" +#include "gdk/gdk.h" + //----------------------------------------------------------------------------- // wxPen //----------------------------------------------------------------------------- class wxPenRefData: public wxObjectRefData { - public: - - wxPenRefData(void); - - int m_width; - int m_style; - int m_joinStyle; - int m_capStyle; - wxColour m_colour; +public: + + wxPenRefData(void); + wxPenRefData(const wxPenRefData& data); + + int m_width; + int m_style; + int m_joinStyle; + int m_capStyle; + wxColour m_colour; }; -wxPenRefData::wxPenRefData(void) +wxPenRefData::wxPenRefData() { - m_width = 1; - m_style = wxSOLID; - m_joinStyle = wxJOIN_ROUND; - m_capStyle = wxCAP_ROUND; -}; + m_width = 1; + m_style = wxSOLID; + m_joinStyle = wxJOIN_ROUND; + m_capStyle = wxCAP_ROUND; +} + +wxPenRefData::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; +} //----------------------------------------------------------------------------- @@ -46,159 +57,136 @@ wxPenRefData::wxPenRefData(void) IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject) -wxPen::wxPen(void) +wxPen::wxPen() { - if (wxThePenList) wxThePenList->AddPen( this ); -}; + if (wxThePenList) wxThePenList->AddPen( this ); +} 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; - if (wxThePenList) wxThePenList->AddPen( this ); -}; + m_refData = new wxPenRefData(); + M_PENDATA->m_width = width; + M_PENDATA->m_style = style; + M_PENDATA->m_colour = colour; -wxPen::wxPen( const wxString &colourName, int width, int style ) -{ - m_refData = new wxPenRefData(); - M_PENDATA->m_width = width; - M_PENDATA->m_style = style; - M_PENDATA->m_colour = colourName; - if (wxThePenList) wxThePenList->AddPen( this ); -}; + if (wxThePenList) wxThePenList->AddPen( this ); +} wxPen::wxPen( const wxPen& pen ) { - Ref( pen ); - if (wxThePenList) wxThePenList->AddPen( this ); -}; - -wxPen::wxPen( const wxPen* pen ) -{ - UnRef(); - if (pen) Ref( *pen ); - if (wxThePenList) wxThePenList->AddPen( this ); -}; + Ref( pen ); + if (wxThePenList) wxThePenList->AddPen( this ); +} -wxPen::~wxPen(void) +wxPen::~wxPen() { - if (wxThePenList) wxThePenList->RemovePen( this ); -}; + if (wxThePenList) wxThePenList->RemovePen( this ); +} wxPen& wxPen::operator = ( const wxPen& pen ) { - if (*this == pen) return (*this); - Ref( pen ); - return *this; -}; + if (*this == pen) return (*this); + Ref( pen ); + return *this; +} bool wxPen::operator == ( const wxPen& pen ) { - return m_refData == pen.m_refData; -}; + return m_refData == pen.m_refData; +} bool wxPen::operator != ( const wxPen& pen ) { - return m_refData != pen.m_refData; -}; + return m_refData != pen.m_refData; +} void wxPen::SetColour( const wxColour &colour ) { - if (!m_refData) - m_refData = new wxPenRefData(); - - M_PENDATA->m_colour = colour; -}; - -void wxPen::SetColour( const wxString &colourName ) -{ - if (!m_refData) - m_refData = new wxPenRefData(); - - M_PENDATA->m_colour = colourName; -}; + Unshare(); + M_PENDATA->m_colour = colour; +} void wxPen::SetColour( int red, int green, int blue ) { - if (!m_refData) - m_refData = new wxPenRefData(); - - M_PENDATA->m_colour.Set( red, green, blue ); -}; + Unshare(); + M_PENDATA->m_colour.Set( red, green, blue ); +} void wxPen::SetCap( int capStyle ) { - if (!m_refData) - m_refData = new wxPenRefData(); - - M_PENDATA->m_capStyle = capStyle; -}; + Unshare(); + M_PENDATA->m_capStyle = capStyle; +} void wxPen::SetJoin( int joinStyle ) { - if (!m_refData) - m_refData = new wxPenRefData(); - - M_PENDATA->m_joinStyle = joinStyle; -}; + Unshare(); + M_PENDATA->m_joinStyle = joinStyle; +} void wxPen::SetStyle( int style ) { - if (!m_refData) - m_refData = new wxPenRefData(); - - M_PENDATA->m_style = style; -}; + Unshare(); + M_PENDATA->m_style = style; +} void wxPen::SetWidth( int width ) { - if (!m_refData) - m_refData = new wxPenRefData(); - - M_PENDATA->m_width = width; -}; + Unshare(); + M_PENDATA->m_width = width; +} -int wxPen::GetCap(void) const +int wxPen::GetCap() const { - return M_PENDATA->m_capStyle; -}; + wxCHECK_MSG( Ok(), -1, _T("invalid pen") ); + + return M_PENDATA->m_capStyle; +} -int wxPen::GetJoin(void) const +int wxPen::GetJoin() const { - if (!m_refData) - return 0; - else + wxCHECK_MSG( Ok(), -1, _T("invalid pen") ); + return M_PENDATA->m_joinStyle; -}; +} -int wxPen::GetStyle(void) const +int wxPen::GetStyle() const { - if (!m_refData) - return 0; - else + wxCHECK_MSG( Ok(), -1, _T("invalid pen") ); + return M_PENDATA->m_style; -}; +} -int wxPen::GetWidth(void) const +int wxPen::GetWidth() const { - if (!m_refData) - return 0; - else + wxCHECK_MSG( Ok(), -1, _T("invalid pen") ); + return M_PENDATA->m_width; -}; +} -wxColour &wxPen::GetColour(void) const +wxColour &wxPen::GetColour() const { - if (!m_refData) - return wxNullColour; - else - return M_PENDATA->m_colour; -}; + wxCHECK_MSG( Ok(), wxNullColour, _T("invalid pen") ); -bool wxPen::Ok(void) const -{ - return (m_refData); -}; + return M_PENDATA->m_colour; +} + +bool wxPen::Ok() const +{ + return (m_refData != NULL); +} + +void wxPen::Unshare() +{ + if (!m_refData) + { + m_refData = new wxPenRefData(); + } + else + { + wxPenRefData* ref = new wxPenRefData( *(wxPenRefData*)m_refData ); + UnRef(); + m_refData = ref; + } +}