CGImage Creation is always available under OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -83,7 +83,7 @@ void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bi
|
|||||||
info->u.iconRef = bmp->GetIconRef() ;
|
info->u.iconRef = bmp->GetIconRef() ;
|
||||||
AcquireIconRef( info->u.iconRef ) ;
|
AcquireIconRef( info->u.iconRef ) ;
|
||||||
}
|
}
|
||||||
#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
|
#ifdef __WXMAC_OSX__
|
||||||
else if ( forceType == kControlContentCGImageRef )
|
else if ( forceType == kControlContentCGImageRef )
|
||||||
{
|
{
|
||||||
info->contentType = kControlContentCGImageRef ;
|
info->contentType = kControlContentCGImageRef ;
|
||||||
@@ -112,7 +112,7 @@ void wxMacReleaseBitmapButton( ControlButtonContentInfo*info )
|
|||||||
{
|
{
|
||||||
// owned by the bitmap, no release here
|
// owned by the bitmap, no release here
|
||||||
}
|
}
|
||||||
#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
|
#ifdef __WXMAC_OSX__
|
||||||
else if ( info->contentType == kControlContentCGImageRef )
|
else if ( info->contentType == kControlContentCGImageRef )
|
||||||
{
|
{
|
||||||
CGImageRelease( info->u.imageRef ) ;
|
CGImageRelease( info->u.imageRef ) ;
|
||||||
|
Reference in New Issue
Block a user