X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..fd91cec1417a06b5e0ee09b3e677da5cc73ea0a3:/include/wx/x11/brush.h diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h index 95629e88cb..c261ba205a 100644 --- a/include/wx/x11/brush.h +++ b/include/wx/x11/brush.h @@ -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); } @@ -48,11 +46,11 @@ 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 ); -private: +protected: // ref counting code virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;