X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c40158e40b45fd22c7a166ce1743345fb4d4a4d3..42eba91294e1c374908b63bdc5f22a5c4c29f110:/include/wx/os2/metafile.h

diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h
index cfc3e19168..41e256c552 100644
--- a/include/wx/os2/metafile.h
+++ b/include/wx/os2/metafile.h
@@ -15,9 +15,6 @@
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 
-#include "wx/setup.h"
-
-#if wxUSE_METAFILE
 #include "wx/dc.h"
 #include "wx/gdiobj.h"
 
@@ -40,7 +37,7 @@ class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxMetafile;
 public:
     wxMetafileRefData(void);
-    ~wxMetafileRefData(void);
+    virtual ~wxMetafileRefData(void);
 
 public:
     WXHANDLE m_metafile;
@@ -53,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; }
@@ -74,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
@@ -95,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);
@@ -195,6 +187,5 @@ private:
 };
 #endif
 
-#endif // wxUSE_METAFILE
 #endif
     // _WX_METAFIILE_H_