Applied [ 1555974 ] small wxURL improvements

[wxWidgets.git] / include / wx / os2 / metafile.h

diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h
index 802c9a35684d4cca0493090ea9805c10d0206e23..82e4ef70c8d5dfe781a57596cf07dbd19a0b6870 100644 (file)
--- 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);
     friend class WXDLLEXPORT wxMetafile;
 public:
     wxMetafileRefData(void);

-    ~wxMetafileRefData(void);
+    virtual ~wxMetafileRefData(void);

 
 public:
     WXHANDLE m_metafile;
 
 public:
     WXHANDLE m_metafile;


@@ -50,12 +50,8 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject
 {
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 public:
 {
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 public:

-    // Copy constructor
-    inline wxMetafile(const wxMetafile& metafile)
-    { Ref(metafile); }
-

     wxMetafile(const wxString& file = wxEmptyString);
     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.
 
     // After this is called, the metafile cannot be used for anything
     // since it is now owned by the clipboard.


@@ -71,8 +67,6 @@ public:
     void SetWindowsMappingMode(int mm);
 
     // Operators
     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
     inline bool operator== (const wxMetafile& metafile) const
         { return m_refData == metafile.m_refData; }
     inline bool operator!= (const wxMetafile& metafile) const


@@ -92,7 +86,7 @@ public:
     // Then don't need to supply them to wxMakeMetaFilePlaceable.
     wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg);
 
     // 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);
 
     // Should be called at end of drawing
     virtual wxMetafile *Close(void);