X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c40158e40b45fd22c7a166ce1743345fb4d4a4d3..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/os2/metafile.h?ds=sidebyside

diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h
index cfc3e19168..55cf236972 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"
 
@@ -33,14 +30,14 @@
 #define wxMetaFile wxMetafile
 #define wxMetaFileDC wxMetafileDC
 
-class WXDLLEXPORT wxMetafile;
+class WXDLLIMPEXP_FWD_CORE wxMetafile;
 
 class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData
 {
-    friend class WXDLLEXPORT wxMetafile;
+    friend class WXDLLIMPEXP_FWD_CORE wxMetafile;
 public:
     wxMetafileRefData(void);
-    ~wxMetafileRefData(void);
+    virtual ~wxMetafileRefData(void);
 
 public:
     WXHANDLE m_metafile;
@@ -53,33 +50,22 @@ 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; }
     void SetHMETAFILE(WXHANDLE mf) ;
     inline int GetWindowsMappingMode(void) { return M_METAFILEDATA->m_windowsMappingMode; }
     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
-        { return m_refData != metafile.m_refData; }
 };
 
 class WXDLLEXPORT wxMetafileDC: public wxDC
@@ -95,14 +81,14 @@ 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);
     virtual void SetMapMode(int mode);
     virtual void GetTextExtent(const wxString& string, long *x, long *y,
                                long *descent = NULL, long *externalLeading = NULL,
-                               wxFont *theFont = NULL, bool use16bit = false) const;
+                               const wxFont *theFont = NULL, bool use16bit = false) const;
 
     // Implementation
     inline wxMetafile *GetMetaFile(void) const { return m_metaFile; }
@@ -195,6 +181,5 @@ private:
 };
 #endif
 
-#endif // wxUSE_METAFILE
 #endif
     // _WX_METAFIILE_H_