X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..2301cda0084278f8cde4dc08ac634b88836e699f:/include/wx/mac/carbon/brush.h?ds=sidebyside diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h index 24e9c68219..ae73a725dd 100644 --- a/include/wx/mac/carbon/brush.h +++ b/include/wx/mac/carbon/brush.h @@ -16,7 +16,7 @@ #include "wx/gdiobj.h" #include "wx/bitmap.h" -class WXDLLEXPORT wxBrush; +class WXDLLIMPEXP_FWD_CORE wxBrush; typedef enum { @@ -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(); };