no changes, just remove #if'd out code

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

diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h
index 27d2d0a605df21c6ff2c9feea218e8c2d5c18fb2..ec06a3821ea8850b72af616db9554f3bdffc8916 100644 (file)
--- a/include/wx/mgl/brush.h
+++ b/include/wx/mgl/brush.h
@@ -40,8 +40,8 @@ public:
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const;
 
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const;
 

-    virtual wxBrushStyle GetStyle() const;
-    wxColour &GetColour() const;
+    wxBrushStyle GetStyle() const;
+    wxColour GetColour() const;

     wxBitmap *GetStipple() const;
 
     void SetColour(const wxColour& col);
     wxBitmap *GetStipple() const;
 
     void SetColour(const wxColour& col);


@@ -49,6 +49,11 @@ public:
     void SetStyle(wxBrushStyle style);
     void SetStipple(const wxBitmap& stipple);
 
     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
+

     // implementation:
 
     void* GetMaskPattern() const;
     // implementation:
 
     void* GetMaskPattern() const;