X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dfd2e67583503a2d8592cd3eb1070fabe7426b64..236a9de39afa090fdee3cf91cb5364ceca69e3f8:/include/wx/os2/pen.h diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h index 5c0b38ec68..6488a6b416 100644 --- a/include/wx/os2/pen.h +++ b/include/wx/os2/pen.h @@ -15,7 +15,7 @@ #include "wx/gdiobj.h" #include "wx/bitmap.h" -typedef long wxDash ; +typedef long wxPMDash; class WXDLLEXPORT wxPen; @@ -34,7 +34,7 @@ protected: int m_cap ; wxBitmap m_stipple ; int m_nbDash ; - wxDash * m_dash ; + wxPMDash * m_dash ; wxColour m_colour; WXHPEN m_hPen; }; @@ -74,8 +74,10 @@ 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 ? M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 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 wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };