X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/dfb/brush.h diff --git a/include/wx/dfb/brush.h b/include/wx/dfb/brush.h index 8398b46da4..47799b7e84 100644 --- a/include/wx/dfb/brush.h +++ b/include/wx/dfb/brush.h @@ -28,31 +28,36 @@ class WXDLLIMPEXP_FWD_CORE wxBrush; // wxBrush //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase +class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase { public: wxBrush() {} - wxBrush(const wxColour &colour, int style = wxSOLID); + 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 Ok() const { return IsOk(); } - bool IsOk() const; bool operator==(const wxBrush& brush) const; bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - virtual int GetStyle() const; - wxColour &GetColour() const; + wxBrushStyle GetStyle() const; + wxColour GetColour() const; wxBitmap *GetStipple() const; void SetColour(const wxColour& col); void SetColour(unsigned char r, unsigned char g, unsigned char b); - void SetStyle(int style); + 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: - // ref counting code - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; DECLARE_DYNAMIC_CLASS(wxBrush) };