X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f02a879ed7efc5fcf6328ff47a1352ec82812b7..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/mac/carbon/metafile.h diff --git a/include/wx/mac/carbon/metafile.h b/include/wx/mac/carbon/metafile.h index 93ff61d9e6..e23f826746 100644 --- a/include/wx/mac/carbon/metafile.h +++ b/include/wx/mac/carbon/metafile.h @@ -39,20 +39,16 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject { DECLARE_DYNAMIC_CLASS(wxMetafile) public: - // Copy constructor - wxMetafile(const wxMetafile& metafile) - : wxGDIObject() - { Ref(metafile); } - wxMetafile(const wxString& file = wxEmptyString); - ~wxMetafile(void); + virtual ~wxMetafile(void); // After this is called, the metafile cannot be used for anything // since it is now owned by the clipboard. virtual bool SetClipboard(int width = 0, int height = 0); virtual bool Play(wxDC *dc); - bool Ok() const ; + bool Ok() const { return IsOk(); } + bool IsOk() const ; wxSize GetSize() const; int GetWidth() const { return GetSize().x; } @@ -63,7 +59,6 @@ public: void SetHMETAFILE(WXHMETAFILE mf) ; // Operators - inline wxMetafile& operator = (const wxMetafile& metafile) { if (*this == metafile) return (*this); Ref(metafile); return *this; } inline bool operator == (const wxMetafile& metafile) const { return m_refData == metafile.m_refData; } inline bool operator != (const wxMetafile& metafile) const { return m_refData != metafile.m_refData; } @@ -81,7 +76,7 @@ class WXDLLEXPORT wxMetafileDC: public wxDC int width = 0, int height = 0, const wxString& description = wxEmptyString); - ~wxMetafileDC(void); + virtual ~wxMetafileDC(void); // Should be called at end of drawing virtual wxMetafile *Close(void);