check that the version of __sync_sub_and_fetch that returns a value is supported...

[wxWidgets.git] / include / wx / mac / carbon / metafile.h

diff --git a/include/wx/mac/carbon/metafile.h b/include/wx/mac/carbon/metafile.h
index d0056405066fe53d7b0e32e863a34e282afd3b55..4188807b8a3c6326866c7557a18d7d6d6ac9c9ab 100644 (file)
--- a/include/wx/mac/carbon/metafile.h
+++ b/include/wx/mac/carbon/metafile.h
@@ -22,6 +22,8 @@
 #include "wx/dataobj.h"
 #endif
 
+#include "wx/mac/carbon/dcclient.h"
+
 /*
  * Metafile and metafile device context classes
  *
@@ -57,38 +59,65 @@ 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
 };
 
-class WXDLLEXPORT wxMetafileDC: public wxDC
-{
-  DECLARE_DYNAMIC_CLASS(wxMetafileDC)
 
- public:
-    // the ctor parameters specify the filename (empty for memory metafiles),
-    // the metafile picture size and the optional description/comment
-    wxMetafileDC(const wxString& filename = wxEmptyString,
-                    int width = 0, int height = 0,
-                    const wxString& description = wxEmptyString);
+class WXDLLEXPORT wxMetafileDCImpl: public wxGCDCImpl
+{
+public:
+    wxMetafileDCImpl( wxDC *owner,
+                      const wxString& filename,
+                      int width, int height,
+                      const wxString& description );
 
-  virtual ~wxMetafileDC(void);
+    virtual ~wxMetafileDCImpl();
 
-  // Should be called at end of drawing
-  virtual wxMetafile *Close(void);
+    // Should be called at end of drawing
+    virtual wxMetafile *Close();
 
-  // Implementation
-  inline wxMetafile *GetMetaFile(void) const { return m_metaFile; }
-  inline void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; }
+    // Implementation
+    wxMetafile *GetMetaFile(void) const { return m_metaFile; }
+    void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; }
 
 protected:
     virtual void DoGetSize(int *width, int *height) const;
 
-  wxMetafile*   m_metaFile;
+    wxMetafile*   m_metaFile;
+  
+private:
+    DECLARE_CLASS(wxMetafileDCImpl)
+    DECLARE_NO_COPY_CLASS(wxMetafileDCImpl)
 };
 
+class WXDLLEXPORT wxMetafileDC: public wxDC
+{
+ public:
+    // the ctor parameters specify the filename (empty for memory metafiles),
+    // the metafile picture size and the optional description/comment
+    wxMetafileDC(  const wxString& filename = wxEmptyString,
+                    int width = 0, int height = 0,
+                    const wxString& description = wxEmptyString ) :
+      wxDC( new wxMetafileDCImpl( this, filename, width, height, description) )
+    { }
+                    
+    wxMetafile *GetMetafile() const 
+       { return ((wxMetafileDCImpl*)m_pimpl)->GetMetaFile(); }
+       
+    wxMetafile *Close()
+       { return ((wxMetafileDCImpl*)m_pimpl)->Close(); }
+       
+private:
+    DECLARE_CLASS(wxMetafileDC)
+    DECLARE_NO_COPY_CLASS(wxMetafileDC)
+};
+                    
+          
 /*
  * Pass filename of existing non-placeable metafile, and bounding box.
  * Adds a placeable metafile header, sets the mapping mode to anisotropic,