Merge the cell size attribute the same way that other attributes are

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

diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h
index c10cd42933df31f5e5e20b0529bc40a0136a5c46..afd4906a45135597b55e228234c29a3ca8e0ef62 100644 (file)
--- a/include/wx/os2/metafile.h
+++ b/include/wx/os2/metafile.h
@@ -57,7 +57,7 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject
   inline wxMetafile(const wxMetafile& metafile)
   { Ref(metafile); }
 
-  wxMetafile(const wxString& file = "");
+  wxMetafile(const wxString& file = wxEmptyString);
   ~wxMetafile(void);
 
   // After this is called, the metafile cannot be used for anything
@@ -74,9 +74,12 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject
   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) { return m_refData == metafile.m_refData; }
-  inline bool operator != (const wxMetafile& metafile) { return m_refData != metafile.m_refData; }
+  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; }
 
 protected:
 };
@@ -88,7 +91,7 @@ class WXDLLEXPORT wxMetafileDC: public wxDC
  public:
   // Don't supply origin and extent
   // Supply them to wxMakeMetaFilePlaceable instead.
-  wxMetafileDC(const wxString& file = "");
+  wxMetafileDC(const wxString& file = wxEmptyString);
 
   // Supply origin and extent (recommended).
   // Then don't need to supply them to wxMakeMetaFilePlaceable.