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
This commit is contained in:
parent
e39b5fa457
commit
f72e03b222
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user