Escape underscores

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

diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h
index cfc3e19168160e9e6c1c2daeed559dc37d4ecdd6..332bab1c94b13cf578a7b216a7d4e8f6223621bb 100644 (file)
--- a/include/wx/os2/metafile.h
+++ b/include/wx/os2/metafile.h
@@ -15,9 +15,6 @@
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 

-#include "wx/setup.h"
-
-#if wxUSE_METAFILE

 #include "wx/dc.h"
 #include "wx/gdiobj.h"
 
 #include "wx/dc.h"
 #include "wx/gdiobj.h"
 


@@ -53,10 +50,6 @@ 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(void);
 
     wxMetafile(const wxString& file = wxEmptyString);
     ~wxMetafile(void);
 


@@ -74,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


@@ -195,6 +186,5 @@ private:
 };
 #endif
 
 };
 #endif
 

-#endif // wxUSE_METAFILE

 #endif
     // _WX_METAFIILE_H_
 #endif
     // _WX_METAFIILE_H_