X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e6858cdcb9278b36446466c346d984e7e306553..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/cocoa/brush.h diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h index a3d41f8e98..47970da8cc 100644 --- a/include/wx/cocoa/brush.h +++ b/include/wx/cocoa/brush.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_FWD_CORE wxBrush; // ======================================================================== // wxBrush // ======================================================================== -class WXDLLEXPORT wxBrush: public wxBrushBase +class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase { DECLARE_DYNAMIC_CLASS(wxBrush) // ------------------------------------------------------------------------ @@ -30,6 +30,9 @@ class WXDLLEXPORT 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(); @@ -52,6 +55,11 @@ public: virtual wxBrushStyle GetStyle() const; wxBitmap *GetStipple() const; +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxBrushStyle)style); } +#endif + // wxCocoa WX_NSColor GetNSColor();