X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0416c41834f36316a03720c4ed05cdf36964a2f3..9b49405777342458dc1666001865eef7309b6c30:/include/wx/gtk/brush.h?ds=sidebyside diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h index 6a92478809..848fdf8cc5 100644 --- a/include/wx/gtk/brush.h +++ b/include/wx/gtk/brush.h @@ -10,8 +10,8 @@ #ifndef _WX_GTK_BRUSH_H_ #define _WX_GTK_BRUSH_H_ -class WXDLLIMPEXP_CORE wxBitmap; -class WXDLLIMPEXP_CORE wxColour; +class WXDLLIMPEXP_FWD_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxColour; //----------------------------------------------------------------------------- // wxBrush @@ -22,28 +22,33 @@ 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 ); - ~wxBrush(); + virtual ~wxBrush(); - bool Ok() const { return m_refData != NULL; } + bool operator==(const wxBrush& brush) const; + bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - 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) };