applied patch 410892 (wxCopyFile uses ::CopyFile under Win32, has overwrite parameter)

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

diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index f6381d489e2f798a15215fde91ff195a8ae8378b..c1a648fd24b403a9a6fd08aebcb7a85684adfea3 100644 (file)
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -27,13 +27,6 @@
     #include "wx/dataobj.h"
 #endif
 
     #include "wx/dataobj.h"
 #endif
 

-// provide synonyms for all metafile classes
-#define wxMetaFile wxMetafile
-#define wxMetaFileDC wxMetafileDC
-#define wxMetaFileDataObject wxMetafileDataObject
-
-#define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable
-

 // ----------------------------------------------------------------------------
 // Metafile and metafile device context classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Metafile and metafile device context classes
 // ----------------------------------------------------------------------------


@@ -70,6 +63,7 @@ public:
     bool Ok() const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); };
 
     // set/get the size of metafile for clipboard operations
     bool Ok() const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); };
 
     // set/get the size of metafile for clipboard operations

+    wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); }

     int GetWidth() const { return M_METAFILEDATA->m_width; }
     int GetHeight() const { return M_METAFILEDATA->m_height; }
 
     int GetWidth() const { return M_METAFILEDATA->m_width; }
     int GetHeight() const { return M_METAFILEDATA->m_height; }
 


@@ -99,7 +93,7 @@ class WXDLLEXPORT wxMetafileDC: public wxDC
 public:
     // Don't supply origin and extent
     // Supply them to wxMakeMetaFilePlaceable instead.
 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.
 
     // Supply origin and extent (recommended).
     // Then don't need to supply them to wxMakeMetaFilePlaceable.