]> git.saurik.com Git - wxWidgets.git/commitdiff
CGImage Creation is always available under OS X
authorStefan Csomor <csomor@advancedconcepts.ch>
Mon, 7 Nov 2005 16:34:48 +0000 (16:34 +0000)
committerStefan Csomor <csomor@advancedconcepts.ch>
Mon, 7 Nov 2005 16:34:48 +0000 (16:34 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/carbon/bitmap.cpp

index 8d62f27bc7dce7a49fc7170d21c48e89e90da3a5..9c7272180c85dd0b3f1ac51f9dcd54d99438ac90 100644 (file)
@@ -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 ) ;