github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate the optional menu title argument for MBCreateMenu

Browse Source 
If a specific title is required, one can simply let the second argument be: [[NSMenu alloc] initWithTitle:«title»]
This commit is contained in:
Allan Odgaard
2018-10-13 14:55:47 +02:00
parent b37b857096
commit 4bec98127e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Applications/TextMate/src/AppController.mm
View File

@@ -407,7 +407,7 @@ BOOL HasDocumentWindow (NSArray* windows)
},
};
NSMenu* menu = MBCreateMenu(items, @"AMainMenu", [[OakMainMenu alloc] init]);
NSMenu* menu = MBCreateMenu(items, [[OakMainMenu alloc] initWithTitle:@"AMainMenu"]);
bundlesMenu.delegate = self;
themesMenu.delegate = self;
spellingMenu.delegate = self;

2
Frameworks/MenuBuilder/src/MenuBuilder.h
View File

@@ -35,5 +35,5 @@ struct PUBLIC MBMenuItem
MBMenu submenu;
};
PUBLIC NSMenu* MBCreateMenu (MBMenu const& menu, NSString* title = @"AMainMenu", NSMenu* existingMenu = nil);
PUBLIC NSMenu* MBCreateMenu (MBMenu const& menu, NSMenu* existingMenu = nil);
PUBLIC NSString* MBDumpMenu (NSMenu* menu);

6
Frameworks/MenuBuilder/src/MenuBuilder.mm
View File

@@ -22,7 +22,7 @@ NSMenuItem* MBCreateMenuItem (MBMenuItem const& item)
if(item.submenu.size() > 0 || item.systemMenu != MBMenuTypeRegular || item.delegate || item.submenuRef)
{
NSMenu* submenu = MBCreateMenu(item.submenu, item.title);
NSMenu* submenu = MBCreateMenu(item.submenu, [[NSMenu alloc] initWithTitle:item.title]);
submenu.delegate = item.delegate;
menuItem.submenu = submenu;
@@ -49,9 +49,9 @@ NSMenuItem* MBCreateMenuItem (MBMenuItem const& item)
return menuItem;
}
PUBLIC NSMenu* MBCreateMenu (MBMenu const& items, NSString* title, NSMenu* existingMenu)
PUBLIC NSMenu* MBCreateMenu (MBMenu const& items, NSMenu* existingMenu)
{
NSMenu* menu = existingMenu ?: [[NSMenu alloc] initWithTitle:title];
NSMenu* menu = existingMenu ?: [[NSMenu alloc] initWithTitle:@"AMainMenu"];
for(auto const& item : items)
[menu addItem:MBCreateMenuItem(item)];
return menu;