X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a246f95e96183bc81bf5be5e1927d9bb53094f55..229d3f1c1fac88569a94b7a22fdc3149d57a46d4:/src/mgl/pen.cpp?ds=sidebyside diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp index e46418d070..dc2e476e82 100644 --- a/src/mgl/pen.cpp +++ b/src/mgl/pen.cpp @@ -3,7 +3,7 @@ // Purpose: // Author: Vaclav Slavik // Id: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -131,38 +131,38 @@ bool wxPen::operator != (const wxPen& pen) const 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 */ } void wxPen::SetColour(int red, int green, int blue) { - Unshare(); + AllocExclusive(); M_PENDATA->m_colour.Set(red, green, blue); } void wxPen::SetCap(int capStyle) { - Unshare(); + AllocExclusive(); M_PENDATA->m_capStyle = capStyle; } void wxPen::SetJoin(int joinStyle) { - Unshare(); + AllocExclusive(); M_PENDATA->m_joinStyle = joinStyle; } void wxPen::SetStyle(int style) { - Unshare(); + AllocExclusive(); M_PENDATA->m_style = style; } @@ -172,14 +172,14 @@ void wxPen::SetStipple(const wxBitmap& stipple) wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8, _T("stipple bitmap must be 8x8") ); - Unshare(); + AllocExclusive(); M_PENDATA->m_stipple = stipple; wxBitmapToPixPattern(stipple, &(M_PENDATA->m_pixPattern), NULL); } void wxPen::SetWidth(int width) { - Unshare(); + AllocExclusive(); M_PENDATA->m_width = width; } @@ -254,17 +254,13 @@ bool wxPen::Ok() const return (m_refData != NULL); } -void wxPen::Unshare() +wxObjectRefData *wxPen::CreateRefData() const { - if (!m_refData) - { - m_refData = new wxPenRefData(); - } - else - { - wxPenRefData* ref = new wxPenRefData( *(wxPenRefData*)m_refData ); - UnRef(); - m_refData = ref; - } + return new wxPenRefData; +} + +wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const +{ + return new wxPenRefData(*(wxPenRefData *)data); }