X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6762286db6cf974817dead5b88bebf0e390dbb7e..87f0b1323b7ac77f02133b836c8dfee63b0fd387:/include/wx/osx/metafile.h?ds=sidebyside diff --git a/include/wx/osx/metafile.h b/include/wx/osx/metafile.h index 4421a565bf..b38533a288 100644 --- 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. @@ -22,7 +22,7 @@ #include "wx/dataobj.h" #endif -#include "wx/osx/carbon/dcclient.h" +#include "wx/osx/dcclient.h" /* * Metafile and metafile device context classes @@ -56,13 +56,6 @@ public: // Implementation WXHMETAFILE GetHMETAFILE() const ; void SetHMETAFILE(WXHMETAFILE mf) ; -#ifndef __LP64__ - // Since the native metafile format is PDF for Quartz - // we need a call that allows setting PICT content for - // backwards compatibility - void SetPICT(void* pictHandle) ; -#endif - protected: virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; @@ -95,7 +88,7 @@ protected: private: DECLARE_CLASS(wxMetafileDCImpl) - DECLARE_NO_COPY_CLASS(wxMetafileDCImpl) + wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl); }; class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC @@ -117,7 +110,7 @@ class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC private: DECLARE_CLASS(wxMetafileDC) - DECLARE_NO_COPY_CLASS(wxMetafileDC) + wxDECLARE_NO_COPY_CLASS(wxMetafileDC); }; @@ -133,7 +126,7 @@ private: 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 @@ -145,7 +138,7 @@ class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObjectSimple public: // ctors wxMetafileDataObject() - : wxDataObjectSimple(wxDF_METAFILE) { }; + : wxDataObjectSimple(wxDF_METAFILE) { } wxMetafileDataObject(const wxMetafile& metafile) : wxDataObjectSimple(wxDF_METAFILE), m_metafile(metafile) { }