synchronize GTK2 minimum version in docs

[wxWidgets.git] / include / wx / dfb / pen.h

diff --git a/include/wx/dfb/pen.h b/include/wx/dfb/pen.h
index e70107a8b147c69e2db679f506fea8aa03c91058..00e1f783befcfc2fcef9eedf54589467ed50a961 100644 (file)
--- a/include/wx/dfb/pen.h
+++ b/include/wx/dfb/pen.h
@@ -33,8 +33,8 @@ class WXDLLIMPEXP_CORE wxPen: public wxPenBase
 public:
     wxPen() {}
     wxPen(const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
 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);
 #endif
 
     wxPen(const wxBitmap& stipple, int width);


@@ -51,7 +51,7 @@ public:
     void SetDashes(int number_of_dashes, const wxDash *dash);
     void SetStipple(const wxBitmap& stipple);
 
     void SetDashes(int number_of_dashes, const wxDash *dash);
     void SetStipple(const wxBitmap& stipple);
 

-    wxColour &GetColour() const;
+    wxColour GetColour() const;

     wxPenCap GetCap() const;
     wxPenJoin GetJoin() const;
     wxPenStyle GetStyle() const;
     wxPenCap GetCap() const;
     wxPenJoin GetJoin() const;
     wxPenStyle GetStyle() const;


@@ -61,6 +61,11 @@ public:
     wxDash* GetDash() const;
     wxBitmap *GetStipple() const;
 
     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;
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;