X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e6858cdcb9278b36446466c346d984e7e306553..1237a25bc49396fa39516846a855bf3b0a4fe1f7:/include/wx/x11/brush.h

diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h
index 49586ad0ce..23c142db7d 100644
--- a/include/wx/x11/brush.h
+++ b/include/wx/x11/brush.h
@@ -32,14 +32,17 @@ public:
     wxBrush() { }
 
     wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID );
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+#endif
     wxBrush( const wxBitmap &stippleBitmap );
     virtual ~wxBrush();
 
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
-    virtual wxBrushStyle GetStyle() const;
-    wxColour &GetColour() const;
+    wxBrushStyle GetStyle() const;
+    wxColour GetColour() const;
     wxBitmap *GetStipple() const;
 
     void SetColour( const wxColour& col );
@@ -47,6 +50,11 @@ public:
     void SetStyle( wxBrushStyle style );
     void SetStipple( const wxBitmap& stipple );
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxBrushStyle)style); }
+#endif
+
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;