porting forward scrolling fix

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

diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index 629eefff3c0398aaa43cb7ecc032bb00643512f7..dee2ea82912d0ddff8cbd7404a3f554d1c3bb8d8 100644 (file)
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -100,7 +100,7 @@ wxMetafileRefData::wxMetafileRefData( int width, int height)
 
     CFMutableDataRef data = CFDataCreateMutable(kCFAllocatorDefault, 0);
     m_data.reset(data);
 
     CFMutableDataRef data = CFDataCreateMutable(kCFAllocatorDefault, 0);
     m_data.reset(data);

-    CGDataConsumerRef dataConsumer = UMACGDataConsumerCreateWithCFData(data);
+    CGDataConsumerRef dataConsumer = wxMacCGDataConsumerCreateWithCFData(data);

     m_context = CGPDFContextCreate( dataConsumer, (width != 0 && height != 0) ? &r : NULL , NULL );
     CGDataConsumerRelease( dataConsumer );
     if ( m_context )
     m_context = CGPDFContextCreate( dataConsumer, (width != 0 && height != 0) ? &r : NULL , NULL );
     CGDataConsumerRelease( dataConsumer );
     if ( m_context )


@@ -140,7 +140,7 @@ void wxMetafileRefData::Close()
 
 void wxMetafileRefData::UpdateDocumentFromData()
 {
 
 void wxMetafileRefData::UpdateDocumentFromData()
 {

-    wxCFRef<CGDataProviderRef> provider(UMACGDataProviderCreateWithCFData(m_data));
+    wxCFRef<CGDataProviderRef> provider(wxMacCGDataProviderCreateWithCFData(m_data));

     m_pdfDoc.reset(CGPDFDocumentCreateWithProvider(provider));
     if ( m_pdfDoc != NULL )
     {
     m_pdfDoc.reset(CGPDFDocumentCreateWithProvider(provider));
     if ( m_pdfDoc != NULL )
     {


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

+#ifndef __LP64__

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


@@ -208,7 +209,7 @@ void wxMetafile::SetPICT(void* pictHandle)
     Handle picHandle = (Handle) pictHandle;
     HLock(picHandle);
     CFDataRef data = CFDataCreateWithBytesNoCopy( kCFAllocatorDefault, (const UInt8*) *picHandle, GetHandleSize(picHandle), kCFAllocatorNull);
     Handle picHandle = (Handle) pictHandle;
     HLock(picHandle);
     CFDataRef data = CFDataCreateWithBytesNoCopy( kCFAllocatorDefault, (const UInt8*) *picHandle, GetHandleSize(picHandle), kCFAllocatorNull);

-    wxCFRef<CGDataProviderRef> provider(UMACGDataProviderCreateWithCFData(data));
+    wxCFRef<CGDataProviderRef> provider(wxMacCGDataProviderCreateWithCFData(data));

     QDPictRef pictRef = QDPictCreateWithProvider(provider);
     CGRect rect = QDPictGetBounds(pictRef);
     m_refData = new wxMetafileRefData(wx_static_cast(int, rect.size.width),
     QDPictRef pictRef = QDPictCreateWithProvider(provider);
     CGRect rect = QDPictGetBounds(pictRef);
     m_refData = new wxMetafileRefData(wx_static_cast(int, rect.size.width),


@@ -218,6 +219,7 @@ void wxMetafile::SetPICT(void* pictHandle)
     QDPictRelease( pictRef );
     ((wxMetafileRefData*) m_refData)->Close();
 }
     QDPictRelease( pictRef );
     ((wxMetafileRefData*) m_refData)->Close();
 }

+#endif

 
 bool wxMetaFile::Play(wxDC *dc)
 {
 
 bool wxMetaFile::Play(wxDC *dc)
 {