X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed7ec76de3e7dc4ccd0271d14b37e1017cad0db9..9ef101cd5548aacc4d921683d185b687cb7a6d35:/src/gtk1/pen.cpp diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp index bdb392768e..8fa09cd73f 100644 --- a/src/gtk1/pen.cpp +++ b/src/gtk1/pen.cpp @@ -31,7 +31,7 @@ public: m_style = wxPENSTYLE_SOLID; m_joinStyle = wxJOIN_ROUND; m_capStyle = wxCAP_ROUND; - m_dash = (wxGTKDash*) NULL; + m_dash = NULL; m_countDashes = 0; } @@ -96,18 +96,15 @@ wxPen::wxPen( const wxColour &colour, int width, wxPenStyle style ) M_PENDATA->m_colour = colour; } -wxPen::wxPen(const wxColour& colour, int width, wxBrushStyle style) +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxPen::wxPen(const wxColour& colour, int width, int style) { m_refData = new wxPenRefData(); M_PENDATA->m_width = width; M_PENDATA->m_style = (wxPenStyle)style; M_PENDATA->m_colour = colour; } - -wxPen::~wxPen() -{ - // m_refData unrefed in ~wxObject -} +#endif wxGDIRefData *wxPen::CreateGDIRefData() const { @@ -125,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 ) @@ -178,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; } wxPenCap wxPen::GetCap() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") ); return M_PENDATA->m_capStyle; } wxPenJoin wxPen::GetJoin() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") ); return M_PENDATA->m_joinStyle; } wxPenStyle wxPen::GetStyle() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") ); return M_PENDATA->m_style; } @@ -222,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; +} +