X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d76048f514b0de4307c2490f8806bf41033bc81a..0b187670897ab1a29e609b581f44344d367c55d6:/src/mgl/brush.cpp diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp index 6bddd63b3b..8579529fc8 100644 --- a/src/mgl/brush.cpp +++ b/src/mgl/brush.cpp @@ -3,11 +3,11 @@ // 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 "brush.h" #endif @@ -223,25 +223,25 @@ void* wxBrush::GetPixPattern() const void wxBrush::SetColour(const wxColour& col) { - Unshare(); + AllocExclusive(); M_BRUSHDATA->m_colour = col; } void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b) { - Unshare(); + AllocExclusive(); M_BRUSHDATA->m_colour.Set(r, g, b); } void wxBrush::SetStyle( int style ) { - Unshare(); + AllocExclusive(); M_BRUSHDATA->m_style = style; } void wxBrush::SetStipple(const wxBitmap& stipple) { - Unshare(); + AllocExclusive(); wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") ); wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8, @@ -257,17 +257,13 @@ void wxBrush::SetStipple(const wxBitmap& stipple) M_BRUSHDATA->m_style = wxSTIPPLE; } -void wxBrush::Unshare() +wxObjectRefData *wxBrush::CreateRefData() const { - if (!m_refData) - { - m_refData = new wxBrushRefData(); - } - else - { - wxBrushRefData* ref = new wxBrushRefData(*(wxBrushRefData*)m_refData); - UnRef(); - m_refData = ref; - } + return new wxBrushRefData; +} + +wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const +{ + return new wxBrushRefData(*(wxBrushRefData *)data); }