X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..ca9047f7ad39a108ad7d71cffdf933c947c91554:/src/gtk1/pen.cpp?ds=sidebyside diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp index cecc379b85..8fa09cd73f 100644 --- a/src/gtk1/pen.cpp +++ b/src/gtk1/pen.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/pen.cpp +// Name: src/gtk1/pen.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -11,7 +11,10 @@ #include "wx/wxprec.h" #include "wx/pen.h" -#include "wx/colour.h" + +#ifndef WX_PRECOMP + #include "wx/colour.h" +#endif #include @@ -19,21 +22,21 @@ // wxPen //----------------------------------------------------------------------------- -class wxPenRefData: public wxObjectRefData +class wxPenRefData : public wxGDIRefData { public: wxPenRefData() { m_width = 1; - m_style = wxSOLID; + m_style = wxPENSTYLE_SOLID; m_joinStyle = wxJOIN_ROUND; m_capStyle = wxCAP_ROUND; - m_dash = (wxGTKDash*) NULL; + m_dash = NULL; m_countDashes = 0; } wxPenRefData( const wxPenRefData& data ) - : wxObjectRefData() + : wxGDIRefData() { m_style = data.m_style; m_width = data.m_width; @@ -71,9 +74,9 @@ public: } int m_width; - int m_style; - int m_joinStyle; - int m_capStyle; + wxPenStyle m_style; + wxPenJoin m_joinStyle; + wxPenCap m_capStyle; wxColour m_colour; int m_countDashes; wxGTKDash *m_dash; @@ -85,7 +88,7 @@ public: IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject) -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; @@ -93,17 +96,22 @@ wxPen::wxPen( const wxColour &colour, int width, int style ) M_PENDATA->m_colour = colour; } -wxPen::~wxPen() +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxPen::wxPen(const wxColour& colour, int width, int style) { - // m_refData unrefed in ~wxObject + m_refData = new wxPenRefData(); + M_PENDATA->m_width = width; + M_PENDATA->m_style = (wxPenStyle)style; + M_PENDATA->m_colour = colour; } +#endif -wxObjectRefData *wxPen::CreateRefData() const +wxGDIRefData *wxPen::CreateGDIRefData() const { return new wxPenRefData; } -wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const +wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const { return new wxPenRefData(*(wxPenRefData *)data); } @@ -114,7 +122,7 @@ bool wxPen::operator == ( const wxPen& pen ) const if (!m_refData || !pen.m_refData) return false; - return ( *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData ); + return *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData; } void wxPen::SetColour( const wxColour &colour ) @@ -132,28 +140,28 @@ void wxPen::SetDashes( int number_of_dashes, const wxDash *dash ) M_PENDATA->m_dash = (wxGTKDash *)dash; } -void wxPen::SetColour( const unsigned char red, const unsigned char green, const unsigned char blue ) +void wxPen::SetColour( unsigned char red, unsigned char green, unsigned char blue ) { AllocExclusive(); M_PENDATA->m_colour.Set( red, green, blue ); } -void wxPen::SetCap( int capStyle ) +void wxPen::SetCap( wxPenCap capStyle ) { AllocExclusive(); M_PENDATA->m_capStyle = capStyle; } -void wxPen::SetJoin( int joinStyle ) +void wxPen::SetJoin( wxPenJoin joinStyle ) { AllocExclusive(); M_PENDATA->m_joinStyle = joinStyle; } -void wxPen::SetStyle( int style ) +void wxPen::SetStyle( wxPenStyle style ) { AllocExclusive(); @@ -167,39 +175,50 @@ void wxPen::SetWidth( int width ) M_PENDATA->m_width = width; } +void wxPen::SetStipple(const wxBitmap& WXUNUSED(stipple)) +{ + wxFAIL_MSG( "stippled pens not supported" ); +} + int wxPen::GetDashes( wxDash **ptr ) const { - *ptr = (M_PENDATA ? (wxDash*)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 { + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + return (M_PENDATA->m_countDashes); } 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; } @@ -211,9 +230,15 @@ 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; } + +wxBitmap *wxPen::GetStipple() const +{ + return NULL; +} +