[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55523] trunk/blender/intern/ghost/intern: GHOST_Cocoa, let new fullscreen also appear on 10.6 deployed builds

jens verwiebe info at jensverwiebe.de
Sat Mar 23 00:48:27 CET 2013


Revision: 55523
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55523
Author:   jensverwiebe
Date:     2013-03-22 23:48:26 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
GHOST_Cocoa, let new fullscreen also appear on 10.6 deployed builds

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

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2013-03-22 23:04:14 UTC (rev 55522)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2013-03-22 23:48:26 UTC (rev 55523)
@@ -662,7 +662,7 @@
 				
 				[windowMenu addItemWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""];
 				
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 // make it build with  10.6 deployment target, but as it is not available in 10.6, it will get weaklinked
 				menuItem = [windowMenu addItemWithTitle:@"Enter Full Screen" action:@selector(toggleFullScreen:) keyEquivalent:@"f" ];
 				[menuItem setKeyEquivalentModifierMask:NSCommandKeyMask];
 #endif

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm	2013-03-22 23:04:14 UTC (rev 55522)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm	2013-03-22 23:48:26 UTC (rev 55523)
@@ -623,7 +623,7 @@
 	[m_window registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType,
 										  NSStringPboardType, NSTIFFPboardType, nil]];
 	
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
 	[NSApp setPresentationOptions:(NSApplicationPresentationFullScreen)];
 	[m_window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
 #endif




More information about the Bf-blender-cvs mailing list