pen.h depends from brush.h in compat mode

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

diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index a99899b188ea162fd52d3d47a398fc8b1f3354ab..73d5b77f9ab8a651fa60b7328ac23bbd776dad68 100644 (file)
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -24,89 +24,172 @@
 
 #include "wx/metafile.h"
 #include "wx/clipbrd.h"
 
 #include "wx/metafile.h"
 #include "wx/clipbrd.h"

-#include "wx/mac/private.h"
+#include "wx/mac/uma.h"

 #include "wx/graphics.h"
 #include "wx/graphics.h"

+#include "wx/mac/carbon/metafile.h"

 
 #include <stdio.h>
 #include <string.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC)
 
 #include <stdio.h>
 #include <string.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC)

+IMPLEMENT_ABSTRACT_CLASS(wxMetafileDCImpl, wxGCDCImpl)

 
 

-class wxMetafileRefData: public wxGDIRefData
-{
-    friend class WXDLLEXPORT wxMetafile;
+#define M_METAFILEREFDATA( a ) ((wxMetafileRefData*)(a).GetRefData())

 
 

+class wxMetafileRefData : public wxGDIRefData
+{

 public:
 public:

-    wxMetafileRefData();
+    // default ctor needed for CreateGDIRefData(), must be initialized later
+    wxMetafileRefData() { Init(); }
+
+    // creates a metafile from memory, assumes ownership
+    wxMetafileRefData(CFDataRef data);
+
+    // prepares a recording metafile
+    wxMetafileRefData( int width, int height);
+
+    // prepares a metafile to be read from a file (if filename is not empty)
+    wxMetafileRefData( const wxString& filename);
+

     virtual ~wxMetafileRefData();
 
     virtual ~wxMetafileRefData();
 

+    virtual bool IsOk() const { return m_data != NULL; }
+
+    void Init();
+
+    int GetWidth() const { return m_width; }
+    int GetHeight() const { return m_height; }
+
+    CGPDFDocumentRef GetPDFDocument() const { return m_pdfDoc; }
+    void UpdateDocumentFromData() ;
+
+    const wxCFDataRef& GetData() const { return m_data; }
+    CGContextRef GetContext() const { return m_context; }
+
+    // ends the recording
+    void Close();

 private:
 private:

-    PicHandle m_metafile;
+    wxCFDataRef m_data;
+    wxCFRef<CGPDFDocumentRef> m_pdfDoc;
+    CGContextRef m_context;

 
 

-#if wxMAC_USE_CORE_GRAPHICS
-    QDPictRef m_qdPictRef;
-#endif
+    int m_width ;
+    int m_height ;

 };
 
 };
 

-wxMetafileRefData::wxMetafileRefData()
+wxMetafileRefData::wxMetafileRefData(CFDataRef data) :
+    m_data(data)

 {
 {

-    m_metafile = NULL;
+    Init();
+    UpdateDocumentFromData();
+}

 
 

-#if wxMAC_USE_CORE_GRAPHICS
-    m_qdPictRef = NULL;
-#endif
+wxMetafileRefData::wxMetafileRefData( const wxString& filename )
+{
+    Init();
+
+    if ( !filename.empty() )
+    {
+        wxCFRef<CFMutableStringRef> cfMutableString(CFStringCreateMutableCopy(NULL, 0, wxCFStringRef(filename)));
+        CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
+        wxCFRef<CFURLRef> url(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kCFURLPOSIXPathStyle, false));
+        m_pdfDoc.reset(CGPDFDocumentCreateWithURL(url));
+    }

 }
 
 }
 

-wxMetafileRefData::~wxMetafileRefData()
+
+wxMetafileRefData::wxMetafileRefData( int width, int height)

 {
 {

-    if (m_metafile)
+    Init();
+
+    m_width = width;
+    m_height = height;
+
+    CGRect r = CGRectMake( 0 , 0 , width  , height );
+
+    CFMutableDataRef data = CFDataCreateMutable(kCFAllocatorDefault, 0);
+    m_data.reset(data);
+    CGDataConsumerRef dataConsumer = wxMacCGDataConsumerCreateWithCFData(data);
+    m_context = CGPDFContextCreate( dataConsumer, (width != 0 && height != 0) ? &r : NULL , NULL );
+    CGDataConsumerRelease( dataConsumer );
+    if ( m_context )

     {
     {

-#ifndef __LP64__
-        KillPicture( (PicHandle)m_metafile );
-        m_metafile = NULL;
+        CGPDFContextBeginPage(m_context, NULL);

 
 

-#if wxMAC_USE_CORE_GRAPHICS
-        QDPictRelease( m_qdPictRef );
-        m_qdPictRef = NULL;
-#endif
-#endif
+        CGColorSpaceRef genericColorSpace  = wxMacGetGenericRGBColorSpace();
+
+        CGContextSetFillColorSpace( m_context, genericColorSpace );
+        CGContextSetStrokeColorSpace( m_context, genericColorSpace );
+
+        CGContextTranslateCTM( m_context , 0 ,  height ) ;
+        CGContextScaleCTM( m_context , 1 , -1 ) ;

     }
 }
 
     }
 }
 

-wxMetaFile::wxMetaFile(const wxString& file)
+wxMetafileRefData::~wxMetafileRefData()

 {
 {

-    m_refData = new wxMetafileRefData;
+}

 
 

-    M_METAFILEDATA->m_metafile = NULL;
-    wxASSERT_MSG( file.empty(), wxT("no file-based metafile support yet") );
+void wxMetafileRefData::Init()
+{
+    m_context = NULL;
+    m_width = -1;
+    m_height = -1;
+}

 
 

-#if 0
-    if (!file.IsNull() && (file.Cmp("") == 0))
-        M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile( file );
-#endif
+void wxMetafileRefData::Close()
+{
+    CGPDFContextEndPage(m_context);
+
+    CGContextRelease(m_context);
+    m_context = NULL;
+
+    UpdateDocumentFromData();
+}
+
+void wxMetafileRefData::UpdateDocumentFromData()
+{
+    wxCFRef<CGDataProviderRef> provider(wxMacCGDataProviderCreateWithCFData(m_data));
+    m_pdfDoc.reset(CGPDFDocumentCreateWithProvider(provider));
+    if ( m_pdfDoc != NULL )
+    {
+        CGPDFPageRef page = CGPDFDocumentGetPage( m_pdfDoc, 1 );
+        CGRect rect = CGPDFPageGetBoxRect ( page, kCGPDFMediaBox);
+        m_width = wx_static_cast(int, rect.size.width);
+        m_height = wx_static_cast(int, rect.size.height);
+    }
+}
+
+wxMetaFile::wxMetaFile(const wxString& file)
+{
+    m_refData = new wxMetafileRefData(file);

 }
 
 wxMetaFile::~wxMetaFile()
 {
 }
 
 }
 
 wxMetaFile::~wxMetaFile()
 {
 }
 

-bool wxMetaFile::IsOk() const
+wxGDIRefData *wxMetaFile::CreateGDIRefData() const
+{
+    return new wxMetafileRefData;
+}
+
+wxGDIRefData *wxMetaFile::CloneGDIRefData(const wxGDIRefData *data) const

 {
 {

-    return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != NULL));
+    return new wxMetafileRefData(*wx_static_cast(const wxMetafileRefData *, data));

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

-    return (WXHMETAFILE) M_METAFILEDATA->m_metafile;
+    return (WXHMETAFILE) (CFDataRef) M_METAFILEDATA->GetData();

 }
 
 }
 

-bool wxMetaFile::SetClipboard(int width, int height)
+bool wxMetaFile::SetClipboard(int WXUNUSED(width), int WXUNUSED(height))

 {
     bool success = true;
 
 #if wxUSE_DRAG_AND_DROP
 {
     bool success = true;
 
 #if wxUSE_DRAG_AND_DROP

-    // TODO: to finish this port, we need the data object first

     if (m_refData == NULL)
         return false;
 
     if (m_refData == NULL)
         return false;
 


@@ -130,58 +213,50 @@ void wxMetafile::SetHMETAFILE(WXHMETAFILE mf)
 {
     UnRef();
 
 {
     UnRef();
 

-    m_refData = new wxMetafileRefData;
-
-    M_METAFILEDATA->m_metafile = (PicHandle)mf;
-
-#if wxMAC_USE_CORE_GRAPHICS
-    size_t sz = GetHandleSize( (Handle) M_METAFILEDATA->m_metafile );
-    wxMemoryBuffer* membuf = new wxMemoryBuffer( sz );
-    void *data = membuf->GetWriteBuf( sz );
-
-    memcpy( data, *M_METAFILEDATA->m_metafile, sz );
-    membuf->UngetWriteBuf( sz );
-    CGDataProviderRef provider = CGDataProviderCreateWithData(
-        membuf, data, sz, wxMacMemoryBufferReleaseProc );
-    M_METAFILEDATA->m_qdPictRef = NULL;
+    m_refData = new wxMetafileRefData((CFDataRef)mf);
+}

 
 #ifndef __LP64__
 
 #ifndef __LP64__

-    if (provider != NULL)
-    {
-        M_METAFILEDATA->m_qdPictRef = QDPictCreateWithProvider( provider );
-        CGDataProviderRelease( provider );
-    }
-#endif
-#endif
+void wxMetafile::SetPICT(void* pictHandle)
+{
+    UnRef();
+
+    Handle picHandle = (Handle) pictHandle;
+    HLock(picHandle);
+    CFDataRef data = CFDataCreateWithBytesNoCopy( kCFAllocatorDefault, (const UInt8*) *picHandle, GetHandleSize(picHandle), kCFAllocatorNull);
+    wxCFRef<CGDataProviderRef> provider(wxMacCGDataProviderCreateWithCFData(data));
+    QDPictRef pictRef = QDPictCreateWithProvider(provider);
+    CGRect rect = QDPictGetBounds(pictRef);
+    m_refData = new wxMetafileRefData(wx_static_cast(int, rect.size.width),
+                                      wx_static_cast(int, rect.size.height));
+    QDPictDrawToCGContext( ((wxMetafileRefData*) m_refData)->GetContext(), rect, pictRef );
+    CFRelease( data );
+    QDPictRelease( pictRef );
+    ((wxMetafileRefData*) m_refData)->Close();

 }
 }

+#endif

 
 bool wxMetaFile::Play(wxDC *dc)
 {
     if (!m_refData)
         return false;
 
 
 bool wxMetaFile::Play(wxDC *dc)
 {
     if (!m_refData)
         return false;
 

-    if (!dc->Ok())
+    if (!dc->IsOk())

         return false;
 
     {
         return false;
 
     {

-#if wxMAC_USE_CORE_GRAPHICS
-#ifndef __LP64__
-        QDPictRef cgPictRef = M_METAFILEDATA->m_qdPictRef;
-        CGContextRef cg = (CGContextRef) dc->GetGraphicsContext()->GetNativeContext();
-        CGRect bounds = QDPictGetBounds( cgPictRef );
-
-        CGContextSaveGState( cg );
-        CGContextTranslateCTM( cg, 0, bounds.size.width );
-        CGContextScaleCTM( cg, 1, -1 );
-        QDPictDrawToCGContext( cg, bounds, cgPictRef );
-        CGContextRestoreGState( cg );
-#endif
-#else
-        PicHandle pict = (PicHandle)GetHMETAFILE();
-        wxMacPortSetter helper( dc );
-        Rect picFrame;
-        DrawPicture( pict, wxMacGetPictureBounds( pict, &picFrame ) );
-#endif
+        wxDCImpl *impl = dc->GetImpl();
+        wxGCDCImpl *gc_impl = wxDynamicCast(impl, wxGCDCImpl);
+        if (gc_impl)
+        {
+            CGContextRef cg = (CGContextRef) (gc_impl->GetGraphicsContext()->GetNativeContext());
+            CGPDFDocumentRef doc = M_METAFILEDATA->GetPDFDocument();
+            CGPDFPageRef page = CGPDFDocumentGetPage( doc, 1 );
+            wxMacCGContextStateSaver save(cg);
+            CGContextDrawPDFPage( cg, page );
+        }
+//        CGContextTranslateCTM( cg, 0, bounds.size.width );
+//        CGContextScaleCTM( cg, 1, -1 );

     }
 
     return true;
     }
 
     return true;


@@ -193,13 +268,8 @@ wxSize wxMetaFile::GetSize() const
 
     if (Ok())
     {
 
     if (Ok())
     {

-#ifndef __LP64__
-       PicHandle pict = (PicHandle)GetHMETAFILE();
-        Rect r;
-        wxMacGetPictureBounds( pict, &r );
-        dataSize.x = r.right - r.left;
-        dataSize.y = r.bottom - r.top;
-#endif
+        dataSize.x = M_METAFILEDATA->GetWidth();
+        dataSize.y = M_METAFILEDATA->GetHeight();

     }
 
     return dataSize;
     }
 
     return dataSize;


@@ -210,37 +280,32 @@ wxSize wxMetaFile::GetSize() const
 // New constructor that takes origin and extent. If you use this, don't
 // give origin/extent arguments to wxMakeMetaFilePlaceable.
 
 // New constructor that takes origin and extent. If you use this, don't
 // give origin/extent arguments to wxMakeMetaFilePlaceable.
 

-wxMetaFileDC::wxMetaFileDC(
+wxMetafileDCImpl::wxMetafileDCImpl(
+    wxDC *owner,

     const wxString& filename,
     int width, int height,
     const wxString& filename,
     int width, int height,

-    const wxString& WXUNUSED(description) )
+    const wxString& WXUNUSED(description) ) :
+    wxGCDCImpl( owner )

 {
 {

-    wxASSERT_MSG( width <= 0 || height <= 0, wxT("no arbitration of metafile size supported") );
+    wxASSERT_MSG( width != 0 || height != 0, wxT("no arbitration of metafile size supported") );

     wxASSERT_MSG( filename.empty(), wxT("no file based metafile support yet"));
 
     m_metaFile = new wxMetaFile( filename );
     wxASSERT_MSG( filename.empty(), wxT("no file based metafile support yet"));
 
     m_metaFile = new wxMetaFile( filename );

+    wxMetafileRefData* metafiledata = new wxMetafileRefData(width, height);
+    m_metaFile->UnRef();
+    m_metaFile->SetRefData( metafiledata );

 
 

-#if wxMAC_USE_CORE_GRAPHICS
-#else
-    Rect r = { 0, 0, height, width };
-
-    RectRgn( (RgnHandle)m_macBoundaryClipRgn, &r );
-    CopyRgn( (RgnHandle)m_macBoundaryClipRgn, (RgnHandle)m_macCurrentClipRgn );
-
-    m_metaFile->SetHMETAFILE( (WXHMETAFILE)OpenPicture( &r ) );
-    ::GetPort( (GrafPtr*)&m_macPort );
-
-    m_ok = true;
-#endif
+    SetGraphicsContext( wxGraphicsContext::CreateFromNative(metafiledata->GetContext()));
+    m_ok = (m_graphicContext != NULL) ;

 
     SetMapMode( wxMM_TEXT );
 }
 
 
     SetMapMode( wxMM_TEXT );
 }
 

-wxMetaFileDC::~wxMetaFileDC()
+wxMetafileDCImpl::~wxMetafileDCImpl()

 {
 }
 
 {
 }
 

-void wxMetaFileDC::DoGetSize(int *width, int *height) const
+void wxMetafileDCImpl::DoGetSize(int *width, int *height) const

 {
     wxCHECK_RET( m_metaFile, wxT("GetSize() doesn't work without a metafile") );
 
 {
     wxCHECK_RET( m_metaFile, wxT("GetSize() doesn't work without a metafile") );
 


@@ -251,38 +316,49 @@ void wxMetaFileDC::DoGetSize(int *width, int *height) const
         (*height) = sz.y;
 }
 
         (*height) = sz.y;
 }
 

-wxMetaFile *wxMetaFileDC::Close()
+wxMetaFile *wxMetafileDCImpl::Close()

 {
 {

-#ifndef __LP64__
-    ClosePicture();
-#endif
+    delete m_graphicContext;
+    m_graphicContext = NULL;
+    m_ok = false;
+
+    M_METAFILEREFDATA(*m_metaFile)->Close();
+

     return m_metaFile;
 }
 
 #if wxUSE_DATAOBJ
 size_t wxMetafileDataObject::GetDataSize() const
 {
     return m_metaFile;
 }
 
 #if wxUSE_DATAOBJ
 size_t wxMetafileDataObject::GetDataSize() const
 {

-    return GetHandleSize( (Handle) (*((wxMetafile*)&m_metafile)).GetHMETAFILE() );
+    CFIndex length = 0;
+    wxMetafileRefData* refData = M_METAFILEREFDATA(m_metafile);
+    if ( refData )
+        length = refData->GetData().GetLength();
+    return length;

 }
 
 bool wxMetafileDataObject::GetDataHere(void *buf) const
 {
 }
 
 bool wxMetafileDataObject::GetDataHere(void *buf) const
 {

-    Handle pictH = (Handle)(*((wxMetafile*)&m_metafile)).GetHMETAFILE();
-    bool result = (pictH != NULL);
-
-    if (result)
-        memcpy( buf, *pictH, GetHandleSize( pictH ) );
+    bool result = false;

 
 

+    wxMetafileRefData* refData = M_METAFILEREFDATA(m_metafile);
+    if ( refData )
+    {
+        CFIndex length = refData->GetData().GetLength();
+        if ( length > 0 )
+        {
+            result = true ;
+            refData->GetData().GetBytes(CFRangeMake(0,length), (UInt8 *) buf);
+        }
+    }

     return result;
 }
 
 bool wxMetafileDataObject::SetData(size_t len, const void *buf)
 {
     return result;
 }
 
 bool wxMetafileDataObject::SetData(size_t len, const void *buf)
 {

-    Handle handle = NewHandle( len );
-    SetHandleSize( handle, len );
-    memcpy( *handle, buf, len );
-    m_metafile.SetHMETAFILE( (WXHMETAFILE) handle );
-
+    wxMetafileRefData* metafiledata = new wxMetafileRefData(wxCFRefFromGet(wxCFDataRef((UInt8*)buf, len).get()));
+    m_metafile.UnRef();
+    m_metafile.SetRefData( metafiledata );

     return true;
 }
 #endif
     return true;
 }
 #endif