X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ffb03bec35bb766bc468c08e0f495746f4585ad..ca6911c361b04290fe1f0e64b616249b3b3d71ba:/include/wx/msw/brush.h?ds=inline diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h index 621b0c28c7..d4ddc8d813 100644 --- a/include/wx/msw/brush.h +++ b/include/wx/msw/brush.h @@ -20,11 +20,14 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap; // wxBrush // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBrush : public wxBrushBase +class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase { public: wxBrush(); wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) ); +#endif wxBrush(const wxBitmap& stipple); virtual ~wxBrush(); @@ -37,9 +40,14 @@ public: bool operator!=(const wxBrush& brush) const { return !(*this == brush); } wxColour GetColour() const; - virtual wxBrushStyle GetStyle() const; + wxBrushStyle GetStyle() const; wxBitmap *GetStipple() const; +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxBrushStyle)style); } +#endif + // return the HBRUSH for this brush virtual WXHANDLE GetResourceHandle() const;