use WPARAM (which is 64 bit under Win64) for timer ids instead of long (which is...

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

diff --git a/include/wx/osx/metafile.h b/include/wx/osx/metafile.h
index 4421a565bf56d8939e1ebd907b46a1e7139471f0..07c93e82621281711259c2193a8a74d157351a88 100644 (file)
--- a/include/wx/osx/metafile.h
+++ b/include/wx/osx/metafile.h
@@ -22,7 +22,7 @@
 #include "wx/dataobj.h"
 #endif
 
 #include "wx/dataobj.h"
 #endif
 

-#include "wx/osx/carbon/dcclient.h"
+#include "wx/osx/dcclient.h"

 
 /*
  * Metafile and metafile device context classes
 
 /*
  * Metafile and metafile device context classes


@@ -95,7 +95,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


@@ -117,7 +117,7 @@ class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC
 
 private:
     DECLARE_CLASS(wxMetafileDC)
 
 private:
     DECLARE_CLASS(wxMetafileDC)

-    DECLARE_NO_COPY_CLASS(wxMetafileDC)
+    wxDECLARE_NO_COPY_CLASS(wxMetafileDC);

 };
 
 
 };