X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82cddbd97a4dfbd0dcf5c44c9336173d6dd386ef..74c34d22773e39b13fe0502798494b38f261a9e5:/include/wx/x11/pen.h

diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h
index a6b350f21c..7e31ff6d1d 100644
--- a/include/wx/x11/pen.h
+++ b/include/wx/x11/pen.h
@@ -35,8 +35,8 @@ public:
     wxPen() { }
 
     wxPen( const wxColour &colour, 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 );
@@ -52,9 +52,9 @@ public:
     void SetStyle( wxPenStyle style );
     void SetWidth( int width );
     void SetDashes( int number_of_dashes, const wxDash *dash );
-    void SetStipple( wxBitmap *stipple );
+    void SetStipple( const wxBitmap& stipple );
 
-    wxColour &GetColour() const;
+    wxColour GetColour() const;
     wxPenCap GetCap() const;
     wxPenJoin GetJoin() const;
     wxPenStyle GetStyle() const;
@@ -64,6 +64,11 @@ public:
     wxDash* GetDash() const;
     wxBitmap* GetStipple() const;
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxPenStyle)style); }
+#endif
+
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;