No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h
index a184c8f3b15785a95205ff6057a8ba96426072f5..e4ede7f560e220525a35c36dfc8e2beb013f2e35 100644 (file)
--- a/include/wx/gtk1/brush.h
+++ b/include/wx/gtk1/brush.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk1/brush.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,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 );
@@ -48,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
+
 private:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;