X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69c4481222795d89f470020b63ec788bb717c0b3..2724d84bbefd440b4e63997eb45ec9636bcd955d:/include/wx/x11/brush.h?ds=sidebyside diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h index 7544f90877..23c142db7d 100644 --- a/include/wx/x11/brush.h +++ b/include/wx/x11/brush.h @@ -1,68 +1,65 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: brush.h +// Name: wx/x11/brush.h // Purpose: wxBrush class // Author: Julian Smart, Robert Roebling // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart, Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_BRUSH_H_ #define _WX_BRUSH_H_ -#ifdef __GNUG__ -#pragma interface "brush.h" -#endif - #include "wx/gdiobj.h" //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- -class wxBrush; -class wxColour; -class wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxBrush; +class WXDLLIMPEXP_FWD_CORE wxColour; +class WXDLLIMPEXP_FWD_CORE wxBitmap; //----------------------------------------------------------------------------- // wxBrush //----------------------------------------------------------------------------- -class wxBrush: public wxGDIObject +class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase { public: wxBrush() { } - - wxBrush( const wxColour &colour, int style ); + + 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(); - - wxBrush( const wxBrush &brush ) { Ref(brush); } - wxBrush& operator = ( const wxBrush& brush ) { Ref(brush); return *this; } - - bool Ok() const { return m_refData != NULL; } - - bool operator == ( const wxBrush& brush ) const; - bool operator != (const wxBrush& brush) const { return !(*this == brush); } + virtual ~wxBrush(); + + bool operator==(const wxBrush& brush) const; + bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - 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 ); -private: - // ref counting code - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxBrushStyle)style); } +#endif + +protected: + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + DECLARE_DYNAMIC_CLASS(wxBrush) }; -#endif -// _WX_BRUSH_H_ +#endif // _WX_BRUSH_H_