[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25072] trunk/blender/intern/ghost/intern/ GHOST_SystemCocoa.mm: Cocoa: remove errors for all supported SDK/ CPU configs

Damien Plisson damien.plisson at yahoo.fr
Wed Dec 2 14:05:32 CET 2009


Revision: 25072
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25072
Author:   damien78
Date:     2009-12-02 14:05:31 +0100 (Wed, 02 Dec 2009)

Log Message:
-----------
Cocoa: remove errors for all supported SDK/CPU configs

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2009-12-02 11:55:47 UTC (rev 25071)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2009-12-02 13:05:31 UTC (rev 25072)
@@ -863,7 +863,11 @@
 #else
 	//If build against an older SDK, check if running on 10.6 to use the correct function
 	if ([NSEvent respondsToSelector:@selector(modifierFlags)]) {
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
 		modifiers = (unsigned int)[NSEvent modifierFlags];
+#else
+		modifiers = (NSUInteger)[NSEvent modifierFlags];
+#endif
 	}
 	else {
 		//TODO: need to find a better workaround for the missing cocoa "getModifierFlag" function in 10.4/10.5





More information about the Bf-blender-cvs mailing list