X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e6858cdcb9278b36446466c346d984e7e306553..e9e8b38179b147dd04f5c19af7e56a94342e93a7:/include/wx/mgl/brush.h diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h index 318018f8cb..ec06a3821e 100644 --- a/include/wx/mgl/brush.h +++ b/include/wx/mgl/brush.h @@ -27,18 +27,21 @@ class WXDLLIMPEXP_FWD_CORE wxBrush; // wxBrush //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBrush : public wxBrushBase +class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase { 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; - virtual wxBrushStyle GetStyle() const; - wxColour &GetColour() const; + wxBrushStyle GetStyle() const; + wxColour GetColour() const; wxBitmap *GetStipple() const; void SetColour(const wxColour& col); @@ -46,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;