X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82cddbd97a4dfbd0dcf5c44c9336173d6dd386ef..06cd40a8b92bb3836ba90aa9475daa0546d44c84:/include/wx/cocoa/pen.h?ds=inline

diff --git a/include/wx/cocoa/pen.h b/include/wx/cocoa/pen.h
index 223c2d43cc..279f3d3894 100644
--- a/include/wx/cocoa/pen.h
+++ b/include/wx/cocoa/pen.h
@@ -21,13 +21,13 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap;
 // ========================================================================
 // wxPen
 // ========================================================================
-class WXDLLEXPORT wxPen: public wxGDIObject
+class WXDLLIMPEXP_CORE wxPen: public wxGDIObject
 {
 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);
     virtual ~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);