X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a31a5f85341a2ef131d86a1dee12f3d6c8156118..0d1c8f39baaaeb7a7f757091209eab471ef5dbc4:/src/mac/carbon/pen.cpp diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp index 3c3d9f033b..7f0acfebe5 100644 --- a/src/mac/carbon/pen.cpp +++ b/src/mac/carbon/pen.cpp @@ -1,26 +1,24 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: pen.cpp +// Name: src/mac/carbon/pen.cpp // Purpose: wxPen // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "pen.h" -#endif +#include "wx/wxprec.h" -#include "wx/setup.h" -#include "wx/utils.h" #include "wx/pen.h" -#if !USE_SHARED_LIBRARIES -IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) +#ifndef WX_PRECOMP + #include "wx/utils.h" #endif +IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) + wxPenRefData::wxPenRefData() { m_style = wxSOLID; @@ -32,7 +30,7 @@ wxPenRefData::wxPenRefData() } wxPenRefData::wxPenRefData(const wxPenRefData& data) - : wxGDIRefData() +: wxGDIRefData() { m_style = data.m_style; m_width = data.m_width; @@ -90,17 +88,17 @@ wxPen::wxPen(const wxBitmap& stipple, int Width) void wxPen::Unshare() { - // Don't change shared data - if (!m_refData) + // Don't change shared data + if (!m_refData) { - m_refData = new wxPenRefData(); - } + m_refData = new wxPenRefData(); + } else { - wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData); - UnRef(); - m_refData = ref; - } + wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData); + UnRef(); + m_refData = ref; + } } void wxPen::SetColour(const wxColour& col) @@ -108,7 +106,7 @@ void wxPen::SetColour(const wxColour& col) Unshare(); M_PENDATA->m_colour = col; - + RealizeResource(); } @@ -117,7 +115,7 @@ void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b) Unshare(); M_PENDATA->m_colour.Set(r, g, b); - + RealizeResource(); } @@ -145,7 +143,7 @@ void wxPen::SetStipple(const wxBitmap& Stipple) M_PENDATA->m_stipple = Stipple; M_PENDATA->m_style = wxSTIPPLE; - + RealizeResource(); } @@ -155,7 +153,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash) M_PENDATA->m_nbDash = nb_dashes; M_PENDATA->m_dash = (wxDash *)Dash; - + RealizeResource(); } @@ -179,8 +177,6 @@ void wxPen::SetCap(int Cap) bool wxPen::RealizeResource() { - // nothing to do here for mac - return TRUE; + // nothing to do here for mac + return true; } - -