Update version to 2.9.4 in version.bkl too and rebake everything.

[wxWidgets.git] / src / osx / carbon / metafile.cpp

diff --git a/src/osx/carbon/metafile.cpp b/src/osx/carbon/metafile.cpp
index 0c936000670c18a4f2dc63da954d6d4c57e3a8f0..dde3a496b95972515cb50a4eca55db29fdfc1e96 100644 (file)
--- a/src/osx/carbon/metafile.cpp
+++ b/src/osx/carbon/metafile.cpp
@@ -26,7 +26,7 @@
 #include "wx/clipbrd.h"
 #include "wx/osx/private.h"
 #include "wx/graphics.h"
 #include "wx/clipbrd.h"
 #include "wx/osx/private.h"
 #include "wx/graphics.h"

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

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>


@@ -76,6 +76,11 @@ private:
 
     int m_width ;
     int m_height ;
 
     int m_width ;
     int m_height ;

+
+
+    // Our m_pdfDoc field can't be easily (deep) copied and so we don't define a
+    // copy ctor.
+    wxDECLARE_NO_COPY_CLASS(wxMetafileRefData);

 };
 
 wxMetafileRefData::wxMetafileRefData(CFDataRef data) :
 };
 
 wxMetafileRefData::wxMetafileRefData(CFDataRef data) :


@@ -175,9 +180,12 @@ wxGDIRefData *wxMetaFile::CreateGDIRefData() const
     return new wxMetafileRefData;
 }
 
     return new wxMetafileRefData;
 }
 

-wxGDIRefData *wxMetaFile::CloneGDIRefData(const wxGDIRefData *data) const
+wxGDIRefData *
+wxMetaFile::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const

 {
 {

-    return new wxMetafileRefData(*static_cast<const wxMetafileRefData *>(data));
+    wxFAIL_MSG( wxS("Cloning metafiles is not implemented in wxCarbon.") );
+
+    return new wxMetafileRefData;

 }
 
 WXHMETAFILE wxMetaFile::GetHMETAFILE() const
 }
 
 WXHMETAFILE wxMetaFile::GetHMETAFILE() const


@@ -216,7 +224,7 @@ void wxMetafile::SetHMETAFILE(WXHMETAFILE mf)
     m_refData = new wxMetafileRefData((CFDataRef)mf);
 }
 
     m_refData = new wxMetafileRefData((CFDataRef)mf);
 }
 

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

 void wxMetafile::SetPICT(void* pictHandle)
 {
     UnRef();
 void wxMetafile::SetPICT(void* pictHandle)
 {
     UnRef();


@@ -266,7 +274,7 @@ wxSize wxMetaFile::GetSize() const
 {
     wxSize dataSize = wxDefaultSize;
 
 {
     wxSize dataSize = wxDefaultSize;
 

-    if (Ok())
+    if (IsOk())

     {
         dataSize.x = M_METAFILEDATA->GetWidth();
         dataSize.y = M_METAFILEDATA->GetHeight();
     {
         dataSize.x = M_METAFILEDATA->GetWidth();
         dataSize.y = M_METAFILEDATA->GetHeight();


@@ -318,8 +326,7 @@ void wxMetafileDCImpl::DoGetSize(int *width, int *height) const
 
 wxMetaFile *wxMetafileDCImpl::Close()
 {
 
 wxMetaFile *wxMetafileDCImpl::Close()
 {

-    delete m_graphicContext;
-    m_graphicContext = NULL;
+    wxDELETE(m_graphicContext);

     m_ok = false;
 
     M_METAFILEREFDATA(*m_metaFile)->Close();
     m_ok = false;
 
     M_METAFILEREFDATA(*m_metaFile)->Close();