From: Stefan Csomor Date: Mon, 27 Feb 2012 15:37:24 +0000 (+0000) Subject: no 10.4 support anymore X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/524248fae384b294bf0f646fab684dc95b94a027 no 10.4 support anymore git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/osx/metafile.h b/include/wx/osx/metafile.h index a670312675..b38533a288 100644 --- a/include/wx/osx/metafile.h +++ b/include/wx/osx/metafile.h @@ -56,13 +56,6 @@ public: // Implementation WXHMETAFILE GetHMETAFILE() const ; void SetHMETAFILE(WXHMETAFILE mf) ; -#if wxOSX_USE_COCOA_OR_CARBON && !defined( __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; diff --git a/src/osx/carbon/metafile.cpp b/src/osx/carbon/metafile.cpp index dde3a496b9..0d7607c6f7 100644 --- a/src/osx/carbon/metafile.cpp +++ b/src/osx/carbon/metafile.cpp @@ -224,26 +224,6 @@ void wxMetafile::SetHMETAFILE(WXHMETAFILE mf) m_refData = new wxMetafileRefData((CFDataRef)mf); } -#if wxOSX_USE_COCOA_OR_CARBON && !defined( __LP64__ ) -void wxMetafile::SetPICT(void* pictHandle) -{ - UnRef(); - - Handle picHandle = (Handle) pictHandle; - HLock(picHandle); - CFDataRef data = CFDataCreateWithBytesNoCopy( kCFAllocatorDefault, (const UInt8*) *picHandle, GetHandleSize(picHandle), kCFAllocatorNull); - wxCFRef provider(wxMacCGDataProviderCreateWithCFData(data)); - QDPictRef pictRef = QDPictCreateWithProvider(provider); - CGRect rect = QDPictGetBounds(pictRef); - m_refData = new wxMetafileRefData(static_cast(rect.size.width), - static_cast(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)