From da78cce6ce5596fc6c4f25ebb60b604b46bc0cb0 Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 28 Mar 2019 22:43:38 +0000 Subject: [PATCH] CtrlCore: Cocoa Help menu now free of spotlight git-svn-id: svn://ultimatepp.org/upp/trunk@12912 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlCore/CocoApp.mm | 4 ++-- uppsrc/CtrlLib/MacMenu.mm | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/uppsrc/CtrlCore/CocoApp.mm b/uppsrc/CtrlCore/CocoApp.mm index e703cc5e1..a70c47698 100644 --- a/uppsrc/CtrlCore/CocoApp.mm +++ b/uppsrc/CtrlCore/CocoApp.mm @@ -49,8 +49,6 @@ void CocoInit(int argc, const char **argv, const char **envptr) main_coco_pool = [NSAutoreleasePool new]; [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular]; - - [NSApp setHelpMenu: [[NSMenu alloc] initWithTitle:@"Unused"]]; menubar = [[NSMenu new] autorelease]; id appMenuItem = [[NSMenuItem new] autorelease]; @@ -67,6 +65,8 @@ void CocoInit(int argc, const char **argv, const char **envptr) [NSApp setMainMenu:menubar]; [NSApp setDelegate:[[AppDelegate alloc] init]]; + + [NSApp setHelpMenu: [[NSMenu alloc] initWithTitle:@"Unused"]]; NSFont *sysfont = [NSFont systemFontOfSize:0]; Font::SetFace(0, ToString((CFStringRef)[sysfont familyName]), Font::TTF); diff --git a/uppsrc/CtrlLib/MacMenu.mm b/uppsrc/CtrlLib/MacMenu.mm index 89488544c..38502cbf7 100644 --- a/uppsrc/CtrlLib/MacMenu.mm +++ b/uppsrc/CtrlLib/MacMenu.mm @@ -283,6 +283,9 @@ void TopWindow::SyncMainMenu(bool force) if(current) { CocoMenuBar& bar = *(CocoMenuBar *)current->menubar; [NSApp setMainMenu:bar.cocomenu]; + static NSMenu *dummy = [[NSMenu alloc] initWithTitle:@"Unused"]; + ONCELOCK { [dummy retain]; }; + [NSApp setHelpMenu: dummy]; //Avoid placing spotlight search field into Help } } }