X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d76048f514b0de4307c2490f8806bf41033bc81a..0b187670897ab1a29e609b581f44344d367c55d6:/src/mgl/pen.cpp?ds=inline diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp index 18c599c477..686e6d46db 100644 --- a/src/mgl/pen.cpp +++ b/src/mgl/pen.cpp @@ -3,17 +3,25 @@ // 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 ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "pen.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + #include "wx/pen.h" #include "wx/bitmap.h" +#include "wx/colour.h" #include "wx/mgl/private.h" //----------------------------------------------------------------------------- @@ -124,38 +132,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; } @@ -165,14 +173,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; } @@ -247,17 +255,13 @@ bool wxPen::Ok() const return (m_refData != NULL); } -void wxPen::Unshare() +wxObjectRefData *wxPen::CreateRefData() const +{ + return new wxPenRefData; +} + +wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const { - if (!m_refData) - { - m_refData = new wxPenRefData(); - } - else - { - wxPenRefData* ref = new wxPenRefData( *(wxPenRefData*)m_refData ); - UnRef(); - m_refData = ref; - } + return new wxPenRefData(*(wxPenRefData *)data); }