]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix for building under 10.4, where the BlendMode constants are not defined.
authorKevin Ollivier <kevino@theolliviers.com>
Sun, 22 Feb 2009 21:22:07 +0000 (21:22 +0000)
committerKevin Ollivier <kevino@theolliviers.com>
Sun, 22 Feb 2009 21:22:07 +0000 (21:22 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/osx/carbon/graphics.cpp

index 1c363dc431e2d87259739f669feddccb6fbf275e..33bd0dde0d8fee81f4139536d9efb529da221001 100644 (file)
@@ -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);
     }
-    else
-#endif
 #endif
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+    else
     {
         CGBlendMode mode = kCGBlendModeNormal;
         switch( op )
@@ -1798,6 +1797,7 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op)
         }
         CGContextSetBlendMode(m_cgContext, mode);
     }
+#endif
     return true;
 }