From 884f23207453a9bfbbecbc81499d1f7e6e4b0204 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 20 Jun 2007 08:14:04 +0000
Subject: [PATCH] Compile fixes for non-Core Graphics mode

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/mac/carbon/bitmap.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 21e78ed2a8..009370965e 100644
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -691,7 +691,7 @@ CGImageRef wxBitmapRefData::CGImageCreate() const
     CGImageRef image ;
     if ( m_rawAccessCount > 0 || m_cgImageRef == NULL )
     {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4) && wxMAC_USE_CORE_GRAPHICS
         if ( UMAGetSystemVersion() >= 0x1040 && m_depth != 1 && m_bitmapMask == NULL )
         {
             image = CGBitmapContextCreateImage( m_hBitmap );
@@ -1549,7 +1549,7 @@ void wxBitmap::SetMask(wxMask *mask)
 WXHBITMAP wxBitmap::GetHBITMAP(WXHBITMAP* mask) const
 {
 #if !wxMAC_USE_CORE_GRAPHICS
-    return WXHBITMAP(M_BITMAPDATA->GetHBITMAP((CGContextRef*)mask));
+    return WXHBITMAP(M_BITMAPDATA->GetHBITMAP((GWorldPtr*)mask));
 #else
     return WXHBITMAP(M_BITMAPDATA->GetBitmapContext());
 #endif