incomplete paste error

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

diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h
index 4e39e32276f003fc7a20fe2e3cfb614149e7a6cb..99b81113b55b57a016702fdb3c0b93ecffb1a4ac 100644 (file)
--- a/include/wx/os2/metafile.h
+++ b/include/wx/os2/metafile.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        metafile.h
+// Name:        wx/os2/metafile.h

 // Purpose:     wxMetaFile, wxMetaFileDC classes.
 //              This probably should be restricted to Windows platforms,
 //              but if there is an equivalent on your platform, great.
 // Purpose:     wxMetaFile, wxMetaFileDC classes.
 //              This probably should be restricted to Windows platforms,
 //              but if there is an equivalent on your platform, great.


@@ -82,7 +82,7 @@ public:
     virtual ~wxMetafileDCImpl();
 
     virtual wxMetafile *Close();
     virtual ~wxMetafileDCImpl();
 
     virtual wxMetafile *Close();

-    virtual void SetMapMode(int mode);
+    virtual void SetMapMode(wxMappingMode mode);

     virtual void DoGetTextExtent(const wxString& string,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
     virtual void DoGetTextExtent(const wxString& string,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,


@@ -103,7 +103,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxMetafileDCImpl)
 
 private:
     DECLARE_CLASS(wxMetafileDCImpl)

-    DECLARE_NO_COPY_CLASS(wxMetafileDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl);

 };
 
 class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC
 };
 
 class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC


@@ -118,10 +118,10 @@ public:
     // Supply origin and extent (recommended).
     // Then don't need to supply them to wxMakeMetaFilePlaceable.
     wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg)
     // Supply origin and extent (recommended).
     // Then don't need to supply them to wxMakeMetaFilePlaceable.
     wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg)

-        : wxDC(new wxMetafileDCImpl( this, file, xext, yext, xorg, yorg ))
+        : wxDC(new wxMetafileDCImpl( this, file, xext, yext, xorg, yorg ))

          { }
 
          { }
 

-    wxMetafile *GetMetafile() const 
+    wxMetafile *GetMetafile() const

         { return ((wxMetafileDCImpl*)m_pimpl)->GetMetaFile(); }
 
     virtual ~wxMetafileDC(void)
         { return ((wxMetafileDCImpl*)m_pimpl)->GetMetaFile(); }
 
     virtual ~wxMetafileDC(void)


@@ -136,7 +136,7 @@ public:
 
 private:
     DECLARE_CLASS(wxMetafileDC)
 
 private:
     DECLARE_CLASS(wxMetafileDC)

-    DECLARE_NO_COPY_CLASS(wxMetafileDC)
+    wxDECLARE_NO_COPY_CLASS(wxMetafileDC);

 };
 
 /*
 };
 
 /*


@@ -172,7 +172,7 @@ class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObject
 {
 public:
     // ctors
 {
 public:
     // ctors

-    wxMetafileDataObject() { m_width = 0; m_height = 0; };
+    wxMetafileDataObject() { m_width = 0; m_height = 0; }

     wxMetafileDataObject(const wxMetafile& metafile, int width = 0,int height = 0)
                         :m_metafile(metafile)
                         ,m_width(width)
     wxMetafileDataObject(const wxMetafile& metafile, int width = 0,int height = 0)
                         :m_metafile(metafile)
                         ,m_width(width)