X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac3688c0d8a39d200f0556ad4b401d89b45ff04a..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/cocoa/pen.h?ds=sidebyside diff --git a/include/wx/cocoa/pen.h b/include/wx/cocoa/pen.h index c21325046c..279f3d3894 100644 --- a/include/wx/cocoa/pen.h +++ b/include/wx/cocoa/pen.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap; // ======================================================================== // wxPen // ======================================================================== -class WXDLLEXPORT wxPen: public wxGDIObject +class WXDLLIMPEXP_CORE wxPen: public wxGDIObject { public: wxPen(); @@ -46,7 +46,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; @@ -54,6 +54,12 @@ public: int GetDashes(wxDash **ptr) const; wxBitmap *GetStipple() const; +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxPenStyle)style); } +#endif + + // Cocoa-specific WX_NSColor GetNSColor(); int GetCocoaLineDash(const CGFloat **pattern);