X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e6858cdcb9278b36446466c346d984e7e306553..aa8cbe0b64fb84cadf0fbf7da1690a922085ca5f:/include/wx/dfb/brush.h diff --git a/include/wx/dfb/brush.h b/include/wx/dfb/brush.h index ece3093439..47799b7e84 100644 --- a/include/wx/dfb/brush.h +++ b/include/wx/dfb/brush.h @@ -33,13 +33,16 @@ 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 { return !(*this == brush); } - virtual wxBrushStyle GetStyle() const; - wxColour& GetColour() const; + wxBrushStyle GetStyle() const; + wxColour GetColour() const; wxBitmap *GetStipple() const; void SetColour(const wxColour& col); @@ -47,6 +50,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 + protected: virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;