X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..7ddb15416407390de67cc26b04e91ea99a521f57:/include/wx/gtk1/brush.h diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h index 3a446e000c..7a44ae2a33 100644 --- a/include/wx/gtk1/brush.h +++ b/include/wx/gtk1/brush.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: brush.h +// Name: wx/gtk1/brush.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -11,10 +11,6 @@ #ifndef __GTKBRUSHH__ #define __GTKBRUSHH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" @@ -25,7 +21,7 @@ // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxBrush; +class WXDLLIMPEXP_FWD_CORE wxBrush; //----------------------------------------------------------------------------- // wxBrush @@ -36,33 +32,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(); - - wxBrush( const wxBrush &brush ) - : wxBrushBase() - { Ref(brush); } - wxBrush& operator = ( const wxBrush& brush ) { Ref(brush); return *this; } + 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 + private: - // 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) };