X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..f3d32879d62f58aa8bdf00fbcb5bb2cee5c53816:/include/wx/mac/carbon/brush.h diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h index 31b9593ab0..90ac01b9fe 100644 --- a/include/wx/mac/carbon/brush.h +++ b/include/wx/mac/carbon/brush.h @@ -35,7 +35,7 @@ public: wxBrush(short macThemeBrush ) ; wxBrush(const wxColour& col, int style = wxSOLID); wxBrush(const wxBitmap& stipple); - ~wxBrush(); + virtual ~wxBrush(); virtual void SetColour(const wxColour& col) ; virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ; @@ -44,10 +44,9 @@ public: virtual void MacSetTheme(short macThemeBrush) ; virtual void MacSetThemeBackground(unsigned long macThemeBackground , WXRECTPTR extent) ; - 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 ; @@ -57,15 +56,15 @@ 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 // Useful helper: create the brush resource bool RealizeResource(); - // When setting properties, we must make sure we're not changing - // another object +private: void Unshare(); };