X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/568cdf9c4cba50acac3b67a435f135306c913c1a..ce0d1032d1c9e63bd034575542c5ee4337ab3510:/src/cocoa/pen.mm diff --git a/src/cocoa/pen.mm b/src/cocoa/pen.mm index 21c5865c3b..fcad9b39f2 100644 --- a/src/cocoa/pen.mm +++ b/src/cocoa/pen.mm @@ -6,11 +6,13 @@ // Created: 2003/08/02 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/setup.h" -#include "wx/pen.h" +#include "wx/wxprec.h" +#ifndef WX_PRECOMP + #include "wx/pen.h" +#endif //WX_PRECOMP #include "wx/bitmap.h" #include "wx/colour.h" @@ -321,27 +323,27 @@ void wxPen::SetStipple(const wxBitmap& Stipple) wxColour& wxPen::GetColour() const { - return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); + return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); } int wxPen::GetWidth() const { - return (M_PENDATA ? M_PENDATA->m_width : 0); + return (M_PENDATA ? M_PENDATA->m_width : 0); } int wxPen::GetStyle() const { - return (M_PENDATA ? M_PENDATA->m_style : 0); + return (M_PENDATA ? M_PENDATA->m_style : 0); } int wxPen::GetJoin() const { - return (M_PENDATA ? M_PENDATA->m_join : 0); + return (M_PENDATA ? M_PENDATA->m_join : 0); } int wxPen::GetCap() const { - return (M_PENDATA ? M_PENDATA->m_cap : 0); + return (M_PENDATA ? M_PENDATA->m_cap : 0); } int wxPen::GetDashes(wxDash **ptr) const @@ -351,7 +353,7 @@ int wxPen::GetDashes(wxDash **ptr) const wxBitmap *wxPen::GetStipple() const { - return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); + return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); } WX_NSColor wxPen::GetNSColor() @@ -367,4 +369,3 @@ int wxPen::GetCocoaLineDash(const float **pattern) *pattern = NULL; return 0; } -