X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac3688c0d8a39d200f0556ad4b401d89b45ff04a..c5c1ea964817e562d1c4b0d89b3937fce28c3f10:/include/wx/mgl/brush.h diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h index b48433e9d3..ec06a3821e 100644 --- a/include/wx/mgl/brush.h +++ b/include/wx/mgl/brush.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxBrush; // wxBrush //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBrush : public wxBrushBase +class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase { public: wxBrush() {} @@ -40,8 +40,8 @@ public: 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); @@ -49,6 +49,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 + // implementation: void* GetMaskPattern() const;