X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..380740af5dd112601916704a6d78d1112ebb31b5:/include/wx/gtk1/brush.h?ds=sidebyside diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h index 2e46a0a9a4..64bf2802f3 100644 --- a/include/wx/gtk1/brush.h +++ b/include/wx/gtk1/brush.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/brush.h +// Name: wx/gtk1/brush.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -21,7 +21,7 @@ // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxBrush; +class WXDLLIMPEXP_FWD_CORE wxBrush; //----------------------------------------------------------------------------- // wxBrush @@ -34,14 +34,10 @@ public: wxBrush( const wxColour &colour, int style = wxSOLID ); wxBrush( const wxBitmap &stippleBitmap ); - ~wxBrush(); + virtual ~wxBrush(); - wxBrush( const wxBrush &brush ) - : wxBrushBase() - { Ref(brush); } - wxBrush& operator = ( const wxBrush& brush ) { Ref(brush); return *this; } - - bool Ok() const { return m_refData != NULL; } + bool Ok() const { return IsOk(); } + bool IsOk() const { return m_refData != NULL; } bool operator == ( const wxBrush& brush ) const; bool operator != (const wxBrush& brush) const { return !(*this == brush); } @@ -51,7 +47,7 @@ public: wxBitmap *GetStipple() const; void SetColour( const wxColour& col ); - void SetColour( const unsigned char r, const unsigned char g, const unsigned char b ); + void SetColour( unsigned char r, unsigned char g, unsigned char b ); void SetStyle( int style ); void SetStipple( const wxBitmap& stipple );