Changeset 440 for trunk

Timestamp:

03/05/08 11:36:21 (17 years ago)

Author:

Nicholas Riley

Message:

Fix user key equivalents showing in contextual Services menu in 10.4

File:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m (modified) (1 diff)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m

@@ -350 +350 @@
 
 NSMenuItem *ICCF_ContextualServicesMenuItem() {
+    // user key equivalents get populated in 10.4, not in 10.5
+    BOOL usesUserKeyEquivalents = [NSMenuItem usesUserKeyEquivalents];
+    if (usesUserKeyEquivalents) {
+        ICCF_SetServicesMenu([NSApp servicesMenu]); // populate menubar menu with key equivalents
+        [NSMenuItem setUsesUserKeyEquivalents: NO];
+    }
+    
     NSMenuItem *servicesItem = ICCF_ServicesMenuItem();
+
+    if (usesUserKeyEquivalents)
+        [NSMenuItem setUsesUserKeyEquivalents: YES];
+
     NSDictionary *servicesInfo = ICCF_GetServicesInfo(); // XXX cache/retain
     if (ICCF_ConsolidateServicesMenu([servicesItem submenu], (NSDictionary *)ICCF_prefs.serviceOptions, servicesInfo))