From f72e03b222e573e4b1311c27ae8cdc31b90be94b Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Sun, 22 Feb 2009 21:22:07 +0000 Subject: [PATCH] Fix for building under 10.4, where the BlendMode constants are not defined. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/graphics.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp index 1c363dc431..33bd0dde0d 100644 --- a/src/osx/carbon/graphics.cpp +++ b/src/osx/carbon/graphics.cpp @@ -1698,7 +1698,6 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op) return true; #if wxOSX_USE_COCOA_OR_CARBON -#if 1 // MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 if ( UMAGetSystemVersion() < 0x1060 ) { CGCompositeOperation cop = kCGCompositeOperationSourceOver; @@ -1749,9 +1748,9 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op) else CGContextSetBlendMode(m_cgContext, mode); } +#endif +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 else -#endif -#endif { CGBlendMode mode = kCGBlendModeNormal; switch( op ) @@ -1798,6 +1797,7 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op) } CGContextSetBlendMode(m_cgContext, mode); } +#endif return true; }