X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1aca6611e695531e77e79e19e19da12d4c57dff0..235a997f9aea9d80774e296d314682e99e0c46f1:/include/wx/os2/brush.h diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h index 0f57600836..c13dcf00fb 100644 --- a/include/wx/os2/brush.h +++ b/include/wx/os2/brush.h @@ -12,11 +12,10 @@ #ifndef _WX_BRUSH_H_ #define _WX_BRUSH_H_ -class WXDLLIMPEXP_FWD_CORE wxColour; -class WXDLLIMPEXP_FWD_CORE wxBitmap; +#include "wx/bitmap.h" // Brush -class WXDLLEXPORT wxBrush: public wxBrushBase +class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase { public: wxBrush(); @@ -37,10 +36,15 @@ public: virtual void SetStipple(const wxBitmap& rStipple); wxColour GetColour(void) const; - virtual wxBrushStyle GetStyle(void) const; + wxBrushStyle GetStyle(void) const; wxBitmap* GetStipple(void) const; int GetPS(void) const; +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxBrushStyle)style); } +#endif + // // Implementation //