X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e7e9e1b68c236fc0701e8313ff20f9768b667c2..2e334012b4babcf063fbe79540c4c154cd54ab2b:/src/gtk/pen.cpp diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp index 7f3809f558..06c0d8c1ed 100644 --- a/src/gtk/pen.cpp +++ b/src/gtk/pen.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: pen.cpp +// Name: src/gtk/pen.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,59 +7,80 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "pen.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/pen.h" +#ifndef WX_PRECOMP + #include "wx/colour.h" +#endif + #include //----------------------------------------------------------------------------- // wxPen //----------------------------------------------------------------------------- -class wxPenRefData: public wxObjectRefData +class wxPenRefData: public wxGDIRefData { public: + wxPenRefData() + { + m_width = 1; + m_style = wxPENSTYLE_SOLID; + m_joinStyle = wxJOIN_ROUND; + m_capStyle = wxCAP_ROUND; + m_dash = (wxGTKDash*) NULL; + m_countDashes = 0; + } - 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( const wxPenRefData& data ) + : wxGDIRefData() + { + 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; + m_dash = data.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; -} + bool operator == (const wxPenRefData& data) const + { + if ( m_countDashes != data.m_countDashes ) + return false; + + if ( m_dash ) + { + if ( !data.m_dash || + memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxGTKDash)) ) + { + return false; + } + } + else if ( data.m_dash ) + { + return false; + } + + + 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; + } -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; -/* - if (data.m_dash) TODO - m_dash = new -*/ - m_dash = data.m_dash; -} + int m_width; + wxPenStyle m_style; + wxPenJoin m_joinStyle; + wxPenCap m_capStyle; + wxColour m_colour; + int m_countDashes; + wxGTKDash *m_dash; +}; //----------------------------------------------------------------------------- @@ -67,125 +88,137 @@ 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 ) +wxPen::wxPen( const wxColour &colour, int width, wxPenStyle 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 ) +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxPen::wxPen(const wxColour& colour, int width, int style) { - Ref( pen ); - if (wxThePenList) wxThePenList->AddPen( this ); + m_refData = new wxPenRefData(); + M_PENDATA->m_width = width; + M_PENDATA->m_style = (wxPenStyle)style; + M_PENDATA->m_colour = colour; } +#endif wxPen::~wxPen() { - if (wxThePenList) wxThePenList->RemovePen( this ); + // m_refData unrefed in ~wxObject } -wxPen& wxPen::operator = ( const wxPen& pen ) +wxGDIRefData *wxPen::CreateGDIRefData() const { - if (*this == pen) return (*this); - Ref( pen ); - return *this; + return new wxPenRefData; } -bool wxPen::operator == ( const wxPen& pen ) +wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *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; } -void wxPen::SetColour( int red, int green, int blue ) +void wxPen::SetColour( unsigned char red, unsigned char green, unsigned char blue ) { - Unshare(); + AllocExclusive(); + M_PENDATA->m_colour.Set( red, green, blue ); } -void wxPen::SetCap( int capStyle ) +void wxPen::SetCap( wxPenCap capStyle ) { - Unshare(); + AllocExclusive(); + M_PENDATA->m_capStyle = capStyle; } -void wxPen::SetJoin( int joinStyle ) +void wxPen::SetJoin( wxPenJoin joinStyle ) { - Unshare(); + AllocExclusive(); + M_PENDATA->m_joinStyle = joinStyle; } -void wxPen::SetStyle( int style ) +void wxPen::SetStyle( wxPenStyle 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); - return (M_PENDATA ? M_PENDATA->m_countDashes : 0); + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + + *ptr = (wxDash*)M_PENDATA->m_dash; + return M_PENDATA->m_countDashes; } -int wxPen::GetDashCount() const -{ - return (M_PENDATA->m_countDashes); +int wxPen::GetDashCount() const +{ + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + + return (M_PENDATA->m_countDashes); } -wxDash* wxPen::GetDash() const -{ - return (M_PENDATA->m_dash); +wxDash* wxPen::GetDash() const +{ + wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + + return (wxDash*)M_PENDATA->m_dash; } -int wxPen::GetCap() const +wxPenCap wxPen::GetCap() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") ); return M_PENDATA->m_capStyle; } -int wxPen::GetJoin() const +wxPenJoin wxPen::GetJoin() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") ); return M_PENDATA->m_joinStyle; } -int wxPen::GetStyle() const +wxPenStyle wxPen::GetStyle() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") ); return M_PENDATA->m_style; } @@ -197,29 +230,21 @@ int wxPen::GetWidth() const return M_PENDATA->m_width; } -wxColour &wxPen::GetColour() const +wxColour wxPen::GetColour() const { wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") ); return M_PENDATA->m_colour; } -bool wxPen::Ok() const +// stippled pens are not supported by wxGTK +void wxPen::SetStipple(const wxBitmap& WXUNUSED(stipple)) { - return (m_refData != NULL); + wxFAIL_MSG( "stippled pens not supported" ); } -void wxPen::Unshare() +wxBitmap *wxPen::GetStipple() const { - if (!m_refData) - { - m_refData = new wxPenRefData(); - } - else - { - wxPenRefData* ref = new wxPenRefData( *(wxPenRefData*)m_refData ); - UnRef(); - m_refData = ref; - } + return NULL; }