Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no 10.4 support anymore

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2012-02-27 15:37:24 +00:00
parent 29c829ba84
commit 524248fae3
2 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/osx/metafile.h
View File

@@ -56,13 +56,6 @@ public:
// Implementation // Implementation
WXHMETAFILE GetHMETAFILE() const ; WXHMETAFILE GetHMETAFILE() const ;
void SetHMETAFILE(WXHMETAFILE mf) ; 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: protected:
virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;

20
src/osx/carbon/metafile.cpp
View File

@@ -224,26 +224,6 @@ void wxMetafile::SetHMETAFILE(WXHMETAFILE mf)
m_refData = new wxMetafileRefData((CFDataRef)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<CGDataProviderRef> provider(wxMacCGDataProviderCreateWithCFData(data));
QDPictRef pictRef = QDPictCreateWithProvider(provider);
CGRect rect = QDPictGetBounds(pictRef);
m_refData = new wxMetafileRefData(static_cast<int>(rect.size.width),
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) bool wxMetaFile::Play(wxDC *dc)
{ {
if (!m_refData) if (!m_refData)