X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbfb8bcc3fa17e079d4219655b173f8ed2ccc65a..8a7e4b38b8fa4d31b805a0cf1779a9b95142f05b:/include/wx/mac/carbon/brush.h diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h index 2bdfa0fb13..49528efbea 100644 --- a/include/wx/mac/carbon/brush.h +++ b/include/wx/mac/carbon/brush.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: brush.h +// Name: wx/mac/carbon/brush.h // Purpose: wxBrush class // Author: Stefan Csomor // Modified by: @@ -35,24 +35,18 @@ public: wxBrush(short macThemeBrush ) ; wxBrush(const wxColour& col, int style = wxSOLID); wxBrush(const wxBitmap& stipple); - wxBrush(const wxBrush& brush) - : wxBrushBase() - { Ref(brush); } - ~wxBrush(); + virtual ~wxBrush(); - virtual void SetColour(const wxColour& col) ; - virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ; + 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) ; virtual void MacSetTheme(short macThemeBrush) ; virtual void MacSetThemeBackground(unsigned long macThemeBackground , WXRECTPTR extent) ; - wxBrush& operator = (const wxBrush& brush) - { if (*this == brush) return (*this); Ref(brush); return *this; } - bool operator == (const wxBrush& brush) const - { return m_refData == brush.m_refData; } + bool operator == (const wxBrush& brush) const; bool operator != (const wxBrush& brush) const - { return m_refData != brush.m_refData; } + { return !(*this == brush); } wxMacBrushKind MacGetBrushKind() const ; @@ -62,7 +56,8 @@ public: virtual int GetStyle() const ; wxBitmap *GetStipple() const ; - virtual bool Ok() const { return (m_refData != NULL) ; } + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk() const { return (m_refData != NULL) ; } // Implementation