OSDN Git Service

Changed to NSMenuItem's parentItem (added in 10.6) rather than the locally declared...
authorEric Branlund <ebranlund@fastmail.com>
Thu, 20 Feb 2020 06:56:10 +0000 (22:56 -0800)
committerEric Branlund <ebranlund@fastmail.com>
Thu, 20 Feb 2020 06:56:10 +0000 (22:56 -0800)
src/main-cocoa.m

index 2d40847..3b79ef6 100644 (file)
@@ -1504,15 +1504,6 @@ static size_t Term_mbcs_cocoa(wchar_t *dest, const char *src, int n)
 }
 
 
-static NSMenuItem *superitem(NSMenuItem *self)
-{
-    NSMenu *supermenu = [[self menu] supermenu];
-    int index = [supermenu indexOfItemWithSubmenu:[self menu]];
-    if (index == -1) return nil;
-    else return [supermenu itemAtIndex:index];
-}
-
-
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem
 {
     int tag = [menuItem tag];
@@ -4089,7 +4080,8 @@ static void hook_quit(const char * str)
     {
         return ! game_in_progress;
     }
-    else if (sel == @selector(setRefreshRate:) && [superitem(menuItem) tag] == 150)
+    else if (sel == @selector(setRefreshRate:) &&
+            [[menuItem parentItem] tag] == 150)
     {
         NSInteger fps = [[NSUserDefaults standardUserDefaults] integerForKey:AngbandFrameRateDefaultsKey];
         [menuItem setState: ([menuItem tag] == fps)];