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@70709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2012-02-27 15:35:31 +00:00
parent 27674b66c0
commit 29c829ba84
1 changed files with 5 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/osx/core/bitmap.cpp
View File

@@ -431,59 +431,19 @@ IconRef wxBitmapRefData::GetIconRef()
switch (sz) switch (sz)
{ {
case 128: case 128:
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 dataType = kIconServices128PixelDataARGB ;
if ( UMAGetSystemVersion() >= 0x1050 )
{
dataType = kIconServices128PixelDataARGB ;
}
else
#endif
{
dataType = kThumbnail32BitData ;
maskType = kThumbnail8BitMask ;
}
break; break;
case 48: case 48:
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 dataType = kIconServices48PixelDataARGB ;
if ( UMAGetSystemVersion() >= 0x1050 )
{
dataType = kIconServices48PixelDataARGB ;
}
else
#endif
{
dataType = kHuge32BitData ;
maskType = kHuge8BitMask ;
}
break; break;
case 32: case 32:
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 dataType = kIconServices32PixelDataARGB ;
if ( UMAGetSystemVersion() >= 0x1050 )
{
dataType = kIconServices32PixelDataARGB ;
}
else
#endif
{
dataType = kLarge32BitData ;
maskType = kLarge8BitMask ;
}
break; break;
case 16: case 16:
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 dataType = kIconServices16PixelDataARGB ;
if ( UMAGetSystemVersion() >= 0x1050 )
{
dataType = kIconServices16PixelDataARGB ;
}
else
#endif
{
dataType = kSmall32BitData ;
maskType = kSmall8BitMask ;
}
break; break;
default: default:
@@ -492,8 +452,7 @@ IconRef wxBitmapRefData::GetIconRef()
if ( dataType != 0 ) if ( dataType != 0 )
{ {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 if ( maskType == 0 )
if ( maskType == 0 && UMAGetSystemVersion() >= 0x1050 )
{ {
size_t datasize = sz * sz * 4 ; size_t datasize = sz * sz * 4 ;
Handle data = NewHandle( datasize ) ; Handle data = NewHandle( datasize ) ;
@@ -555,7 +514,6 @@ IconRef wxBitmapRefData::GetIconRef()
DisposeHandle( data ); DisposeHandle( data );
} }
else else
#endif
{ {
// setup the header properly // setup the header properly
@@ -644,37 +602,6 @@ IconRef wxBitmapRefData::GetIconRef()
PicHandle wxBitmapRefData::GetPictHandle() PicHandle wxBitmapRefData::GetPictHandle()
{ {
if ( m_pictHandle == NULL )
{
#ifndef __LP64__
GraphicsExportComponent exporter = 0;
OSStatus err = OpenADefaultComponent(GraphicsExporterComponentType, kQTFileTypePicture, &exporter);
if (noErr == err)
{
m_pictHandle = (PicHandle) NewHandle(0);
if ( m_pictHandle )
{
// QT does not correctly export the mask
// TODO if we get around to it create a synthetic PICT with the CopyBits and Mask commands
CGImageRef imageRef = CreateCGImage();
err = GraphicsExportSetInputCGImage( exporter, imageRef );
err = GraphicsExportSetOutputHandle(exporter, (Handle)m_pictHandle);
err = GraphicsExportDoExport(exporter, NULL);
CGImageRelease( imageRef );
size_t handleSize = GetHandleSize( (Handle) m_pictHandle );
// the 512 bytes header is only needed for pict files, but not in memory
if ( handleSize >= 512 )
{
memmove( *m_pictHandle , (char*)(*m_pictHandle)+512, handleSize - 512 );
SetHandleSize( (Handle) m_pictHandle, handleSize - 512 );
}
}
CloseComponent( exporter );
}
#endif
}
return m_pictHandle ; return m_pictHandle ;
} }
#endif #endif