correcting CGImage handling to be always correctly initialized and freed on OSX build...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 1e84d4f2c388b4f2aefdff4ae101e1ae74c1b7e0..89f7b3496c0492e38fe68cc0d1745b1c6b631458 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -135,7 +135,7 @@ void wxBitmapRefData::Init()
     m_depth = 0 ;
     m_ok = false ;
     m_bitmapMask = NULL ;
-#if wxMAC_USE_CORE_GRAPHICS
+#ifdef __WXMAC_OSX__
     m_cgImageRef = NULL ;
 #endif
     m_iconRef = NULL ;
@@ -228,7 +228,7 @@ void *wxBitmapRefData::BeginRawAccess()
     // the bitmap data may change now
     wxASSERT_MSG( m_pictHandle == NULL && m_iconRef == NULL ,
         wxT("Currently, modifing bitmaps that are used in controls already is not supported") ) ;
-#if wxMAC_USE_CORE_GRAPHICS
+#ifdef __WXMAC_OSX__
     if ( m_cgImageRef )
     {
         CGImageRelease( m_cgImageRef ) ;
@@ -592,7 +592,7 @@ void wxBitmapRefData::Free()
 {
     wxASSERT_MSG( m_rawAccessCount == 0 , wxT("Bitmap still selected when destroyed") ) ;
 
-#if wxMAC_USE_CORE_GRAPHICS
+#ifdef __WXMAC_OSX__
     if ( m_cgImageRef )
     {
         CGImageRelease( m_cgImageRef ) ;