X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..88db66e3734d7dc8bdc965bd03e8512b64b8a48a:/src/gtk1/pen.cpp diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp index 663f7ad3db..b50ec2063e 100644 --- a/src/gtk1/pen.cpp +++ b/src/gtk1/pen.cpp @@ -38,7 +38,7 @@ wxPenRefData::wxPenRefData(void) m_style = wxSOLID; m_joinStyle = wxJOIN_ROUND; m_capStyle = wxCAP_ROUND; -}; +} //----------------------------------------------------------------------------- @@ -49,7 +49,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject) wxPen::wxPen(void) { if (wxThePenList) wxThePenList->AddPen( this ); -}; +} wxPen::wxPen( const wxColour &colour, int width, int style ) { @@ -57,8 +57,9 @@ wxPen::wxPen( const wxColour &colour, int width, int style ) M_PENDATA->m_width = width; M_PENDATA->m_style = style; M_PENDATA->m_colour = colour; + if (wxThePenList) wxThePenList->AddPen( this ); -}; +} wxPen::wxPen( const wxString &colourName, int width, int style ) { @@ -66,43 +67,45 @@ wxPen::wxPen( const wxString &colourName, int width, int style ) M_PENDATA->m_width = width; M_PENDATA->m_style = style; M_PENDATA->m_colour = colourName; + 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 ); -}; +} wxPen::~wxPen(void) { if (wxThePenList) wxThePenList->RemovePen( this ); -}; +} wxPen& wxPen::operator = ( const wxPen& pen ) { if (*this == pen) return (*this); Ref( pen ); return *this; -}; +} bool wxPen::operator == ( const wxPen& pen ) { return m_refData == pen.m_refData; -}; +} bool wxPen::operator != ( const wxPen& pen ) { return m_refData != pen.m_refData; -}; +} void wxPen::SetColour( const wxColour &colour ) { @@ -110,7 +113,7 @@ void wxPen::SetColour( const wxColour &colour ) m_refData = new wxPenRefData(); M_PENDATA->m_colour = colour; -}; +} void wxPen::SetColour( const wxString &colourName ) { @@ -118,15 +121,15 @@ void wxPen::SetColour( const wxString &colourName ) m_refData = new wxPenRefData(); M_PENDATA->m_colour = colourName; -}; +} -void wxPen::SetColour( const int red, const int green, const int blue ) +void wxPen::SetColour( int red, int green, int blue ) { if (!m_refData) m_refData = new wxPenRefData(); M_PENDATA->m_colour.Set( red, green, blue ); -}; +} void wxPen::SetCap( int capStyle ) { @@ -134,7 +137,7 @@ void wxPen::SetCap( int capStyle ) m_refData = new wxPenRefData(); M_PENDATA->m_capStyle = capStyle; -}; +} void wxPen::SetJoin( int joinStyle ) { @@ -142,7 +145,7 @@ void wxPen::SetJoin( int joinStyle ) m_refData = new wxPenRefData(); M_PENDATA->m_joinStyle = joinStyle; -}; +} void wxPen::SetStyle( int style ) { @@ -150,7 +153,7 @@ void wxPen::SetStyle( int style ) m_refData = new wxPenRefData(); M_PENDATA->m_style = style; -}; +} void wxPen::SetWidth( int width ) { @@ -158,12 +161,12 @@ void wxPen::SetWidth( int width ) m_refData = new wxPenRefData(); M_PENDATA->m_width = width; -}; +} int wxPen::GetCap(void) const { return M_PENDATA->m_capStyle; -}; +} int wxPen::GetJoin(void) const { @@ -171,7 +174,7 @@ int wxPen::GetJoin(void) const return 0; else return M_PENDATA->m_joinStyle; -}; +} int wxPen::GetStyle(void) const { @@ -179,7 +182,7 @@ int wxPen::GetStyle(void) const return 0; else return M_PENDATA->m_style; -}; +} int wxPen::GetWidth(void) const { @@ -187,7 +190,7 @@ int wxPen::GetWidth(void) const return 0; else return M_PENDATA->m_width; -}; +} wxColour &wxPen::GetColour(void) const { @@ -195,10 +198,10 @@ wxColour &wxPen::GetColour(void) const return wxNullColour; else return M_PENDATA->m_colour; -}; +} bool wxPen::Ok(void) const { return (m_refData); -}; +}