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 318018f8cb007366be738363cb07ba60421cfa90..ec06a3821ea8850b72af616db9554f3bdffc8916 100644 (file)
--- a/include/wx/mgl/brush.h
+++ b/include/wx/mgl/brush.h
@@ -27,18 +27,21 @@ class WXDLLIMPEXP_FWD_CORE wxBrush;
 // wxBrush
 //-----------------------------------------------------------------------------
 
 // wxBrush
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxBrush : public wxBrushBase
+class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase

 {
 public:
     wxBrush() {}
     wxBrush(const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
 {
 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);
 
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const;
 
     wxBrush(const wxBitmap &stippleBitmap);
 
     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);


@@ -46,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;