github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-25 14:22:54 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlCore: Cocoa Help menu now free of spotlight

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12912 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2019-03-28 22:43:38 +00:00
parent 300c16e8c8
commit da78cce6ce
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/CtrlCore/CocoApp.mm
View file

@ -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);

3
uppsrc/CtrlLib/MacMenu.mm
View file

@ -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
}
}
}