X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..c2ca375c5620209d77a88d2d378bdcdedbc82e7e:/include/wx/mac/carbon/metafile.h?ds=sidebyside diff --git a/include/wx/mac/carbon/metafile.h b/include/wx/mac/carbon/metafile.h index add0be172a..da46526593 100644 --- a/include/wx/mac/carbon/metafile.h +++ b/include/wx/mac/carbon/metafile.h @@ -40,14 +40,15 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject DECLARE_DYNAMIC_CLASS(wxMetafile) public: 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; } @@ -56,12 +57,6 @@ public: // Implementation WXHMETAFILE GetHMETAFILE() const ; void SetHMETAFILE(WXHMETAFILE mf) ; - - // Operators - 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; } - -protected: }; class WXDLLEXPORT wxMetafileDC: public wxDC @@ -75,7 +70,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);