X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9b4d680d72930c31fe14dd63421a85d97ccd739..47e175a24f862aa8b7ca7dd4a2bb5957991e7f2d:/src/osx/carbon/metafile.cpp?ds=sidebyside diff --git a/src/osx/carbon/metafile.cpp b/src/osx/carbon/metafile.cpp index 6e8905e6b4..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) @@ -274,7 +254,7 @@ wxSize wxMetaFile::GetSize() const { wxSize dataSize = wxDefaultSize; - if (Ok()) + if (IsOk()) { dataSize.x = M_METAFILEDATA->GetWidth(); dataSize.y = M_METAFILEDATA->GetHeight();