X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2555abd7afd7a7a6017f46dd6550d804850fb9f..8fc574b40c0c7dfbe4b19263d1ef178b51a45488:/include/wx/os2/metafile.h diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h index 802c9a3568..41e256c552 100644 --- a/include/wx/os2/metafile.h +++ b/include/wx/os2/metafile.h @@ -37,7 +37,7 @@ class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData friend class WXDLLEXPORT wxMetafile; public: wxMetafileRefData(void); - ~wxMetafileRefData(void); + virtual ~wxMetafileRefData(void); public: WXHANDLE m_metafile; @@ -50,19 +50,16 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject { DECLARE_DYNAMIC_CLASS(wxMetafile) public: - // Copy constructor - inline wxMetafile(const wxMetafile& metafile) - { 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); - inline bool Ok(void) const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); }; + inline bool Ok() const { return IsOk(); } + inline bool IsOk(void) const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); }; // Implementation inline WXHANDLE GetHMETAFILE(void) { return M_METAFILEDATA->m_metafile; } @@ -71,8 +68,6 @@ public: void SetWindowsMappingMode(int mm); // 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 @@ -92,7 +87,7 @@ public: // Then don't need to supply them to wxMakeMetaFilePlaceable. wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg); - ~wxMetafileDC(void); + virtual ~wxMetafileDC(void); // Should be called at end of drawing virtual wxMetafile *Close(void);