#4479: wx.ComboBox needs a SetFont method

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

diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h
index afb78bafa54f4873513cf5640071610aaea5477c..6dd2b763a64f93e0da99fe2bea25eec72386b819 100644 (file)
--- a/include/wx/mgl/brush.h
+++ b/include/wx/mgl/brush.h
@@ -27,23 +27,26 @@ class WXDLLIMPEXP_FWD_CORE wxBrush;
 // wxBrush
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBrush : public wxBrushBase
+class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase
 {
 public:
     wxBrush() {}
-    wxBrush(const wxColour &colour, int style = wxSOLID);
+    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;
 
-    virtual int GetStyle() const;
-    wxColour &GetColour() const;
+    wxBrushStyle GetStyle() const;
+    wxColour GetColour() const;
     wxBitmap *GetStipple() const;
 
     void SetColour(const wxColour& col);
     void SetColour(unsigned char r, unsigned char g, unsigned char b);
-    void SetStyle(int style);
+    void SetStyle(wxBrushStyle style);
     void SetStipple(const wxBitmap& stipple);
 
     // implementation: