X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbfb8bcc3fa17e079d4219655b173f8ed2ccc65a..abbb59e8eb995f445759df30ee507c74af690b51:/include/wx/cocoa/brush.h?ds=sidebyside diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h index 728a0ab2de..4bf3d8a71b 100644 --- a/include/wx/cocoa/brush.h +++ b/include/wx/cocoa/brush.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/cocoa/brush.h +// Name: wx/cocoa/brush.h // Purpose: wxBrush class // Author: David Elliott // Modified by: @@ -31,22 +31,15 @@ public: wxBrush(); wxBrush(const wxColour& col, int style = wxSOLID); wxBrush(const wxBitmap& stipple); - wxBrush(const wxBrush& brush) - : wxBrushBase() - { Ref(brush); } - ~wxBrush(); + virtual ~wxBrush(); // ------------------------------------------------------------------------ // Implementation // ------------------------------------------------------------------------ - virtual void SetColour(const wxColour& col) ; - virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ; - virtual void SetStyle(int style) ; - virtual void SetStipple(const wxBitmap& stipple) ; - - // assignment - wxBrush& operator = (const wxBrush& brush) - { if (*this == brush) return (*this); Ref(brush); return *this; } + virtual void SetColour(const wxColour& col) ; + virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ; + virtual void SetStyle(int style) ; + virtual void SetStipple(const wxBitmap& stipple) ; // comparison bool operator == (const wxBrush& brush) const @@ -59,7 +52,8 @@ public: virtual int GetStyle() const; wxBitmap *GetStipple() const; - virtual bool Ok() const + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk() const { return (m_refData != NULL); } // wxObjectRefData