X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82cddbd97a4dfbd0dcf5c44c9336173d6dd386ef..7a04b644092ff91f8f2c6ecdd191e96285d39a1d:/include/wx/mac/carbon/pen.h diff --git a/include/wx/mac/carbon/pen.h b/include/wx/mac/carbon/pen.h index 9c3c365547..3807aa523e 100644 --- a/include/wx/mac/carbon/pen.h +++ b/include/wx/mac/carbon/pen.h @@ -17,13 +17,13 @@ #include "wx/bitmap.h" // Pen -class WXDLLEXPORT wxPen : public wxPenBase +class WXDLLIMPEXP_CORE wxPen : public wxPenBase { public: wxPen(); wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID); -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( wxPen(const wxColour& col, int width, wxBrushStyle style) ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) ); #endif wxPen(const wxBitmap& stipple, int width); @@ -43,7 +43,7 @@ public: void SetJoin(wxPenJoin join) ; void SetCap(wxPenCap cap) ; - wxColour& GetColour() const ; + wxColour GetColour() const ; int GetWidth() const; wxPenStyle GetStyle() const; wxPenJoin GetJoin() const;