Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for building under 10.4, where the BlendMode constants are not defined.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2009-02-22 21:22:07 +00:00
parent e39b5fa457
commit f72e03b222
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osx/carbon/graphics.cpp
View File

@@ -1698,7 +1698,6 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op)
return true; return true;
#if wxOSX_USE_COCOA_OR_CARBON #if wxOSX_USE_COCOA_OR_CARBON
#if 1 // MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
if ( UMAGetSystemVersion() < 0x1060 ) if ( UMAGetSystemVersion() < 0x1060 )
{ {
CGCompositeOperation cop = kCGCompositeOperationSourceOver; CGCompositeOperation cop = kCGCompositeOperationSourceOver;
@@ -1749,9 +1748,9 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op)
else else
CGContextSetBlendMode(m_cgContext, mode); CGContextSetBlendMode(m_cgContext, mode);
} }
#endif
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
else else
#endif
#endif
{ {
CGBlendMode mode = kCGBlendModeNormal; CGBlendMode mode = kCGBlendModeNormal;
switch( op ) switch( op )
@@ -1798,6 +1797,7 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op)
} }
CGContextSetBlendMode(m_cgContext, mode); CGContextSetBlendMode(m_cgContext, mode);
} }
#endif
return true; return true;
} }