diff --git a/distrib/scripts/mac/macbuild-lipo b/distrib/scripts/mac/macbuild-lipo index 1a45eb57b5..cd4f437d21 100755 --- a/distrib/scripts/mac/macbuild-lipo +++ b/distrib/scripts/mac/macbuild-lipo @@ -16,8 +16,8 @@ do_lipo_build(){ DIR="bld-$1" if [ "$1" = "ppc" ]; then - export CXX="g++-3.3 -arch ppc -DMAC_OS_X_VERSION_MAX_ALLOWED=1030" - export CC="gcc-3.3 -arch ppc -DMAC_OS_X_VERSION_MAX_ALLOWED=1030" + export CXX="g++-3.3 -arch ppc -DMAC_OS_X_VERSION_MAX_ALLOWED=1040" + export CC="gcc-3.3 -arch ppc -DMAC_OS_X_VERSION_MAX_ALLOWED=1040" export MACOSX_DEPLOYMENT_TARGET=10.3 else export CXX="g++-4.0 -arch i386" diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp index eed1bb4f8b..30e3ea99e3 100755 --- a/src/mac/carbon/dccg.cpp +++ b/src/mac/carbon/dccg.cpp @@ -35,14 +35,18 @@ #include "wx/mac/private.h" -#ifndef wxMAC_USE_CORE_GRAPHICS_BLEND_MODES -#define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 0 -#endif - #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 typedef float CGFloat ; #endif +#ifndef wxMAC_USE_CORE_GRAPHICS_BLEND_MODES +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 + #define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 1 +#else + #define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 0 +#endif +#endif + //----------------------------------------------------------------------------- // constants //----------------------------------------------------------------------------- @@ -1561,13 +1565,16 @@ void wxDC::SetLogicalFunction( int function ) m_logicalFunction = function ; #if wxMAC_USE_CORE_GRAPHICS_BLEND_MODES - CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; - if ( m_logicalFunction == wxCOPY ) - CGContextSetBlendMode( cgContext, kCGBlendModeNormal ) ; - else if ( m_logicalFunction == wxINVERT ) - CGContextSetBlendMode( cgContext, kCGBlendModeExclusion ) ; - else - CGContextSetBlendMode( cgContext, kCGBlendModeNormal ) ; + if ( CGContextSetBlendMode != 0 ) + { + CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; + if ( m_logicalFunction == wxCOPY ) + CGContextSetBlendMode( cgContext, kCGBlendModeNormal ) ; + else if ( m_logicalFunction == wxINVERT || m_logicalFunction == wxXOR ) + CGContextSetBlendMode( cgContext, kCGBlendModeExclusion ) ; + else + CGContextSetBlendMode( cgContext, kCGBlendModeNormal ) ; + } #endif }