X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/236a9de39afa090fdee3cf91cb5364ceca69e3f8..35917d228a9fc3cecd3bd8a2b67a3bf34713723b:/include/wx/mac/pen.h diff --git a/include/wx/mac/pen.h b/include/wx/mac/pen.h index 4da77c1586..40c9b5c4ba 100644 --- a/include/wx/mac/pen.h +++ b/include/wx/mac/pen.h @@ -20,8 +20,6 @@ #include "wx/colour.h" #include "wx/bitmap.h" -typedef long wxMACDash; - class WXDLLEXPORT wxPen; class WXDLLEXPORT wxPenRefData: public wxGDIRefData @@ -39,7 +37,7 @@ protected: int m_cap ; wxBitmap m_stipple ; int m_nbDash ; - wxMACDash * m_dash ; + wxDash * m_dash ; wxColour m_colour; /* TODO: implementation WXHPEN m_hPen; @@ -81,10 +79,8 @@ public: inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }; inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }; inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }; - inline int GetDashes(wxDash **ptr) const - { - *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); - return (M_PENDATA ? M_PENDATA->m_nbDash : 0); + inline int GetDashes(wxDash **ptr) const { + *ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0); } inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };