X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b3f61d14cbc6cc117373d173ecf08fbec4c9a38..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/os2/metafile.h?ds=sidebyside

diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h
index 03818f44b1..5036afe6eb 100644
--- a/include/wx/os2/metafile.h
+++ b/include/wx/os2/metafile.h
@@ -1,12 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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.
 // Author:      David Webster
 // Modified by:
 // Created:     10/10/99
-// RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,7 +32,7 @@
 
 class WXDLLIMPEXP_FWD_CORE wxMetafile;
 
-class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData
+class WXDLLIMPEXP_CORE wxMetafileRefData: public wxGDIRefData
 {
     friend class WXDLLIMPEXP_FWD_CORE wxMetafile;
 public:
@@ -49,7 +48,7 @@ public:
 
 #define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
 
-class WXDLLEXPORT wxMetafile: public wxGDIObject
+class WXDLLIMPEXP_CORE wxMetafile: public wxGDIObject
 {
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 public:
@@ -73,7 +72,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 };
 
-class WXDLLEXPORT wxMetafileDCImpl: public wxPMDCImpl
+class WXDLLIMPEXP_CORE wxMetafileDCImpl: public wxPMDCImpl
 {
 public:
     wxMetafileDCImpl(wxDC *owner, const wxString& file = wxEmptyString);
@@ -82,7 +81,7 @@ public:
     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,
@@ -103,10 +102,10 @@ protected:
 
 private:
     DECLARE_CLASS(wxMetafileDCImpl)
-    DECLARE_NO_COPY_CLASS(wxMetafileDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl);
 };
 
-class WXDLLEXPORT wxMetafileDC: public wxDC
+class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC
 {
 public:
     // Don't supply origin and extent
@@ -118,10 +117,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)
-	 : 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)
@@ -136,7 +135,7 @@ public:
 
 private:
     DECLARE_CLASS(wxMetafileDC)
-    DECLARE_NO_COPY_CLASS(wxMetafileDC)
+    wxDECLARE_NO_COPY_CLASS(wxMetafileDC);
 };
 
 /*
@@ -148,10 +147,10 @@ private:
 
 // No origin or extent
 #define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable
-bool WXDLLEXPORT wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);
+bool WXDLLIMPEXP_CORE wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);
 
 // Optional origin and extent
-bool WXDLLEXPORT wxMakeMetaFilePlaceable( const wxString& filename
+bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable( const wxString& filename
                                          ,int x1
                                          ,int y1
                                          ,int x2
@@ -168,11 +167,11 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable( const wxString& filename
 // use.
 
 #if wxUSE_DRAG_AND_DROP
-class WXDLLEXPORT wxMetafileDataObject : public wxDataObject
+class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObject
 {
 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)