X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..07d2031dde57711bee35fa0e8ca886fdb7ea0a41:/src/gtk/pen.cpp?ds=sidebyside diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp index a4fef2c642..7ba9b5940d 100644 --- a/src/gtk/pen.cpp +++ b/src/gtk/pen.cpp @@ -14,7 +14,7 @@ #include "wx/pen.h" -#include "gdk/gdk.h" +#include //----------------------------------------------------------------------------- // wxPen @@ -23,43 +23,48 @@ class wxPenRefData: public wxObjectRefData { public: - - wxPenRefData(); - wxPenRefData( const wxPenRefData& data ); - - int m_width; - int m_style; - int m_joinStyle; - int m_capStyle; - wxColour m_colour; - int m_countDashes; - wxDash *m_dash; -}; - -wxPenRefData::wxPenRefData() -{ - m_width = 1; - m_style = wxSOLID; - m_joinStyle = wxJOIN_ROUND; - m_capStyle = wxCAP_ROUND; - m_dash = (wxDash*) NULL; - m_countDashes = 0; -} - -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; - m_countDashes = data.m_countDashes; + wxPenRefData() + { + m_width = 1; + m_style = wxSOLID; + m_joinStyle = wxJOIN_ROUND; + m_capStyle = wxCAP_ROUND; + m_dash = (wxGTKDash*) 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 + if (data.m_dash) TODO + m_dash = new */ - m_dash = data.m_dash; -} + m_dash = data.m_dash; + } + + 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; + wxGTKDash *m_dash; +}; //----------------------------------------------------------------------------- @@ -67,159 +72,136 @@ wxPenRefData::wxPenRefData( const wxPenRefData& data ) IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject) -wxPen::wxPen() -{ - 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 ); -} - -wxPen::wxPen( const wxPen& pen ) -{ - Ref( pen ); - if (wxThePenList) wxThePenList->AddPen( this ); } wxPen::~wxPen() { - if (wxThePenList) wxThePenList->RemovePen( this ); + // m_refData unrefed in ~wxObject } -wxPen& wxPen::operator = ( const wxPen& pen ) +wxObjectRefData *wxPen::CreateRefData() const { - if (*this == pen) return (*this); - Ref( pen ); - return *this; + return new wxPenRefData; } -bool wxPen::operator == ( const wxPen& pen ) +wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const { - return m_refData == pen.m_refData; + return new wxPenRefData(*(wxPenRefData *)data); } -bool wxPen::operator != ( const wxPen& pen ) +bool wxPen::operator == ( const wxPen& pen ) const { - return m_refData != pen.m_refData; + 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 &colour ) { - Unshare(); + AllocExclusive(); + M_PENDATA->m_colour = colour; } void wxPen::SetDashes( int number_of_dashes, const wxDash *dash ) { - Unshare(); + AllocExclusive(); + M_PENDATA->m_countDashes = number_of_dashes; - M_PENDATA->m_dash = (wxDash *)dash; /* TODO */ + M_PENDATA->m_dash = (wxGTKDash *)dash; /* TODO */ } void wxPen::SetColour( int red, int green, int blue ) { - Unshare(); + AllocExclusive(); + M_PENDATA->m_colour.Set( red, green, blue ); } void wxPen::SetCap( int capStyle ) { - Unshare(); + AllocExclusive(); + M_PENDATA->m_capStyle = capStyle; } void wxPen::SetJoin( int joinStyle ) { - Unshare(); + AllocExclusive(); + M_PENDATA->m_joinStyle = joinStyle; } void wxPen::SetStyle( int style ) { - Unshare(); + AllocExclusive(); + M_PENDATA->m_style = style; } void wxPen::SetWidth( int width ) { - Unshare(); + AllocExclusive(); + M_PENDATA->m_width = width; } -int wxPen::GetDashes( wxDash **ptr ) const +int wxPen::GetDashes( wxDash **ptr ) const { - *ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); + *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_countDashes : 0); } -int wxPen::GetDashCount() const -{ - return (M_PENDATA->m_countDashes); +int wxPen::GetDashCount() const +{ + return (M_PENDATA->m_countDashes); } -wxDash* wxPen::GetDash() const -{ - return (M_PENDATA->m_dash); +wxDash* wxPen::GetDash() const +{ + return (wxDash*)M_PENDATA->m_dash; } int wxPen::GetCap() const { - wxCHECK_MSG( Ok(), -1, T("invalid pen") ); + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); return M_PENDATA->m_capStyle; } int wxPen::GetJoin() const { - wxCHECK_MSG( Ok(), -1, T("invalid pen") ); + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); return M_PENDATA->m_joinStyle; } int wxPen::GetStyle() const { - wxCHECK_MSG( Ok(), -1, T("invalid pen") ); + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); return M_PENDATA->m_style; } int wxPen::GetWidth() const { - wxCHECK_MSG( Ok(), -1, T("invalid pen") ); + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); return M_PENDATA->m_width; } wxColour &wxPen::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, T("invalid pen") ); + wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") ); 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; - } -} -