No code changes, fixed various typos.

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

diff --git a/include/wx/osx/metafile.h b/include/wx/osx/metafile.h
index 4421a565bf56d8939e1ebd907b46a1e7139471f0..01f8734b08724b1aacc09780cffb6d3853f63df1 100644 (file)
--- a/include/wx/osx/metafile.h
+++ b/include/wx/osx/metafile.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        metafile.h
+// Name:        wx/osx/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.


@@ -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


@@ -56,7 +56,7 @@ public:
     // Implementation
     WXHMETAFILE GetHMETAFILE() const ;
     void SetHMETAFILE(WXHMETAFILE mf) ;
     // Implementation
     WXHMETAFILE GetHMETAFILE() const ;
     void SetHMETAFILE(WXHMETAFILE mf) ;

-#ifndef __LP64__
+#if wxOSX_USE_COCOA_OR_CARBON && !defined( __LP64__ )

     // Since the native metafile format is PDF for Quartz
     // we need a call that allows setting PICT content for
     // backwards compatibility
     // Since the native metafile format is PDF for Quartz
     // we need a call that allows setting PICT content for
     // backwards compatibility


@@ -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);

 };
 
 
 };
 
 


@@ -133,7 +133,7 @@ private:
 bool WXDLLIMPEXP_CORE wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);
 
 // Optional origin and extent
 bool WXDLLIMPEXP_CORE wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);
 
 // Optional origin and extent

-bool WXDLLIMPEXP_CORE 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
 
 // ----------------------------------------------------------------------------
 // wxMetafileDataObject is a specialization of wxDataObject for metafile data