X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..d7ad5a0289b22d16a67b9fc2efe1a721e4a5a1ae:/include/wx/palmos/brush.h diff --git a/include/wx/palmos/brush.h b/include/wx/palmos/brush.h index 495ea2e649..3625ad9fd5 100644 --- a/include/wx/palmos/brush.h +++ b/include/wx/palmos/brush.h @@ -22,26 +22,34 @@ class WXDLLIMPEXP_FWD_CORE wxBrush; // wxBrush // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBrush : public wxBrushBase +class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase { public: wxBrush(); - wxBrush(const wxColour& col, int style = wxSOLID); + 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(); virtual void SetColour(const wxColour& col); virtual void SetColour(unsigned char r, unsigned char g, unsigned char b); - virtual void SetStyle(int style); + virtual void SetStyle(wxBrushStyle style); virtual void SetStipple(const wxBitmap& stipple); bool operator==(const wxBrush& brush) const; bool operator!=(const wxBrush& brush) const { return !(*this == brush); } wxColour GetColour() const; - virtual int 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;