Remove use of "size-request" signal for wxWindow sizing.

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

diff --git a/include/wx/dfb/brush.h b/include/wx/dfb/brush.h
index 0d0a46c7a5fbf37df5c1045e56a33f0bfeb97791..47799b7e8452796781f9cde69b2e7fdbf2c8bf4f 100644 (file)
--- a/include/wx/dfb/brush.h
+++ b/include/wx/dfb/brush.h
@@ -41,8 +41,8 @@ public:
     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);
@@ -50,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;