X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..48c8439fdb5bbacf457f3a825bb5a73fe10dd8e7:/include/wx/mac/carbon/bitmap.h?ds=sidebyside diff --git a/include/wx/mac/carbon/bitmap.h b/include/wx/mac/carbon/bitmap.h index b2eb887ecd..418586576b 100644 --- a/include/wx/mac/carbon/bitmap.h +++ b/include/wx/mac/carbon/bitmap.h @@ -34,11 +34,13 @@ class WXDLLEXPORT wxPixelDataBase; class WXDLLEXPORT wxMask: public wxObject { DECLARE_DYNAMIC_CLASS(wxMask) - DECLARE_NO_COPY_CLASS(wxMask) public: wxMask(); + // Copy constructor + wxMask(const wxMask& mask); + // Construct a mask from a bitmap and a colour indicating // the transparent area wxMask(const wxBitmap& bitmap, const wxColour& colour); @@ -157,9 +159,6 @@ public: wxMask *GetMask() const; void SetMask(wxMask *mask) ; - inline bool operator == (const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; } - inline bool operator != (const wxBitmap& bitmap) const { return m_refData != bitmap.m_refData; } - static void InitStandardHandlers(); // raw bitmap access support functions, for internal use only @@ -184,6 +183,11 @@ public: // makes sure that no cached images will be constructed until terminated void *BeginRawAccess() ; void EndRawAccess() ; + +protected: + // ref counting code + virtual wxObjectRefData *CreateRefData() const; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; }; #endif // _WX_BITMAP_H_