X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/236a9de39afa090fdee3cf91cb5364ceca69e3f8..1d0edc0f7306aac10a75c545f9cace25d3cee83d:/src/motif/pen.cpp diff --git a/src/motif/pen.cpp b/src/motif/pen.cpp index 3163d410e4..4bc2b0bd89 100644 --- a/src/motif/pen.cpp +++ b/src/motif/pen.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: pen.cpp +// Name: src/motif/pen.cpp // Purpose: wxPen // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -48,21 +48,17 @@ wxPenRefData::~wxPenRefData() wxPen::wxPen() { - if ( wxThePenList ) - wxThePenList->AddPen(this); } wxPen::~wxPen() { - if (wxThePenList) - wxThePenList->RemovePen(this); } // Should implement Create wxPen::wxPen(const wxColour& col, int Width, int Style) { m_refData = new wxPenRefData; - + M_PENDATA->m_colour = col; M_PENDATA->m_width = Width; M_PENDATA->m_style = Style; @@ -70,17 +66,14 @@ wxPen::wxPen(const wxColour& col, int Width, int Style) M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_dash = (wxMOTIFDash*)NULL; - + RealizeResource(); - - if (wxThePenList) - wxThePenList->AddPen(this); } wxPen::wxPen(const wxBitmap& stipple, int Width) { m_refData = new wxPenRefData; - + M_PENDATA->m_stipple = stipple; M_PENDATA->m_width = Width; M_PENDATA->m_style = wxSTIPPLE; @@ -88,11 +81,8 @@ wxPen::wxPen(const wxBitmap& stipple, int Width) M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_dash = (wxMOTIFDash*)NULL; - + RealizeResource(); - - if ( wxThePenList ) - wxThePenList->AddPen(this); } void wxPen::Unshare() @@ -113,74 +103,74 @@ void wxPen::Unshare() void wxPen::SetColour(const wxColour& col) { Unshare(); - + M_PENDATA->m_colour = col; - + RealizeResource(); } void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b) { Unshare(); - + M_PENDATA->m_colour.Set(r, g, b); - + RealizeResource(); } void wxPen::SetWidth(int Width) { Unshare(); - + M_PENDATA->m_width = Width; - + RealizeResource(); } void wxPen::SetStyle(int Style) { Unshare(); - + M_PENDATA->m_style = Style; - + RealizeResource(); } void wxPen::SetStipple(const wxBitmap& Stipple) { Unshare(); - + M_PENDATA->m_stipple = Stipple; M_PENDATA->m_style = wxSTIPPLE; - + RealizeResource(); } void wxPen::SetDashes(int nb_dashes, const wxDash *Dash) { Unshare(); - + M_PENDATA->m_nbDash = nb_dashes; M_PENDATA->m_dash = (wxMOTIFDash *)Dash; - + RealizeResource(); } void wxPen::SetJoin(int Join) { Unshare(); - + M_PENDATA->m_join = Join; - + RealizeResource(); } void wxPen::SetCap(int Cap) { Unshare(); - + M_PENDATA->m_cap = Cap; - + RealizeResource(); }