X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2ce59e9bb71dbe7a01d96ec3df158e626aaa145..032e024c1c6ab6a20226604baab9d00558620e72:/include/wx/msw/metafile.h

diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index 341b1ce3b8..5af79e6c89 100644
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -25,7 +25,7 @@
 
 class WXDLLIMPEXP_FWD_CORE wxMetafile;
 
-class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData
+class WXDLLIMPEXP_CORE wxMetafileRefData: public wxGDIRefData
 {
 public:
     wxMetafileRefData();
@@ -43,7 +43,7 @@ public:
 
 #define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
 
-class WXDLLEXPORT wxMetafile: public wxGDIObject
+class WXDLLIMPEXP_CORE wxMetafile: public wxGDIObject
 {
 public:
     wxMetafile(const wxString& file = wxEmptyString);
@@ -77,7 +77,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 };
 
-class WXDLLEXPORT wxMetafileDCImpl: public wxMSWDCImpl
+class WXDLLIMPEXP_CORE wxMetafileDCImpl: public wxMSWDCImpl
 {
 public:
     wxMetafileDCImpl(wxDC *owner, const wxString& file = wxEmptyString);
@@ -86,7 +86,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,
@@ -107,10 +107,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
@@ -125,15 +125,15 @@ public:
         : wxDC(new wxMetafileDCImpl( this, file, xext, yext, xorg, yorg ))
         { }
 
-    wxMetafile *GetMetafile() const 
+    wxMetafile *GetMetafile() const
        { return ((wxMetafileDCImpl*)m_pimpl)->GetMetaFile(); }
-       
+
     wxMetafile *Close()
        { return ((wxMetafileDCImpl*)m_pimpl)->Close(); }
 
 private:
     DECLARE_CLASS(wxMetafileDC)
-    DECLARE_NO_COPY_CLASS(wxMetafileDC)
+    wxDECLARE_NO_COPY_CLASS(wxMetafileDC);
 };
 
 
@@ -147,10 +147,10 @@ private:
  */
 
 // No origin or extent
-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, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = true);
+bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = true);
 
 // ----------------------------------------------------------------------------
 // wxMetafileDataObject is a specialization of wxDataObject for metafile data
@@ -158,7 +158,7 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y
 
 #if wxUSE_DRAG_AND_DROP
 
-class WXDLLEXPORT wxMetafileDataObject : public wxDataObjectSimple
+class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObjectSimple
 {
 public:
     // ctors