From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Mon, 7 Nov 2005 16:34:48 +0000 (+0000)
Subject: CGImage Creation is always available under OS X
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/51cdab3ef8d467fd0bf49d42dd4d0330fd4f852b

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
---

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 8d62f27bc7..9c7272180c 100644
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -83,7 +83,7 @@ void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bi
             info->u.iconRef = bmp->GetIconRef() ;
             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 )
         {
             info->contentType = kControlContentCGImageRef ;
@@ -112,7 +112,7 @@ void wxMacReleaseBitmapButton( ControlButtonContentInfo*info )
     {
         // 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 )
     {
         CGImageRelease( info->u.imageRef ) ;