X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..3fd8c9885425ab527572a74d16badc913dfba53c:/include/wx/x11/brush.h?ds=sidebyside diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h index b5a61ad396..c261ba205a 100644 --- a/include/wx/x11/brush.h +++ b/include/wx/x11/brush.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: brush.h +// Name: wx/x11/brush.h // Purpose: wxBrush class // Author: Julian Smart, Robert Roebling // Modified by: @@ -33,12 +33,10 @@ public: wxBrush( const wxColour &colour, int style = wxSOLID ); wxBrush( const wxBitmap &stippleBitmap ); - ~wxBrush(); + virtual ~wxBrush(); - wxBrush( const wxBrush &brush ) { 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); } @@ -52,7 +50,7 @@ public: void SetStyle( int style ); void SetStipple( const wxBitmap& stipple ); -private: +protected: // ref counting code virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;