Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-02 00:29:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

mac: fix copy/paste error, get rid of allocWithZone as it's ignored on 64-bit ABI (nw)

Browse Source
This commit is contained in:
Vas Crabb 2019-11-18 06:05:09 +11:00
parent b662a173bd
commit e4e047f1ad
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osd/modules/debugger/debugosx.mm
View File

@ -211,7 +211,7 @@ void debugger_osx::build_menus()
{ {
NSMenuItem *item; NSMenuItem *item;
NSMenu *const debugMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"Debug"]; NSMenu *const debugMenu = [[NSMenu alloc] initWithTitle:@"Debug"];
item = [[NSApp mainMenu] insertItemWithTitle:@"Debug" action:NULL keyEquivalent:@"" atIndex:1]; item = [[NSApp mainMenu] insertItemWithTitle:@"Debug" action:NULL keyEquivalent:@"" atIndex:1];
[item setSubmenu:debugMenu]; [item setSubmenu:debugMenu];
[debugMenu release]; [debugMenu release];
@ -243,7 +243,7 @@ void debugger_osx::build_menus()
keyEquivalent:[NSString stringWithFormat:@"%C", (short)NSF3FunctionKey]] keyEquivalent:[NSString stringWithFormat:@"%C", (short)NSF3FunctionKey]]
setKeyEquivalentModifierMask:NSShiftKeyMask]; setKeyEquivalentModifierMask:NSShiftKeyMask];
NSMenu *const runMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"Run"]; NSMenu *const runMenu = [[NSMenu alloc] initWithTitle:@"Run"];
item = [[NSApp mainMenu] insertItemWithTitle:@"Run" item = [[NSApp mainMenu] insertItemWithTitle:@"Run"
action:NULL action:NULL
keyEquivalent:@"" keyEquivalent:@""

2
src/osd/modules/debugger/osx/debugview.mm
View File

@ -255,7 +255,7 @@ static void debugwin_view_update(debug_view &view, void *osdprivate)
[self setFont:[[self class] defaultFontForMachine:m]]; [self setFont:[[self class] defaultFontForMachine:m]];
NSMenu *contextMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"Context"]; NSMenu *contextMenu = [[NSMenu alloc] initWithTitle:@"Context"];
[self addContextMenuItemsToMenu:contextMenu]; [self addContextMenuItemsToMenu:contextMenu];
[self setMenu:contextMenu]; [self setMenu:contextMenu];
[contextMenu release]; [contextMenu release];

8
src/osd/modules/debugger/osx/debugwindowhandler.mm
View File

@ -42,7 +42,7 @@ NSString *const MAMESaveDebuggerConfigurationNotification = @"MAMESaveDebuggerCo
NSMenuItem *runParentItem = [menu addItemWithTitle:@"Run" NSMenuItem *runParentItem = [menu addItemWithTitle:@"Run"
action:@selector(debugRun:) action:@selector(debugRun:)
keyEquivalent:[NSString stringWithFormat:@"%C", (short)NSF5FunctionKey]]; keyEquivalent:[NSString stringWithFormat:@"%C", (short)NSF5FunctionKey]];
NSMenu *runMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"Run"]; NSMenu *runMenu = [[NSMenu alloc] initWithTitle:@"Run"];
[runParentItem setSubmenu:runMenu]; [runParentItem setSubmenu:runMenu];
[runMenu release]; [runMenu release];
[runParentItem setKeyEquivalentModifierMask:0]; [runParentItem setKeyEquivalentModifierMask:0];
@ -64,7 +64,7 @@ NSString *const MAMESaveDebuggerConfigurationNotification = @"MAMESaveDebuggerCo
setKeyEquivalentModifierMask:0]; setKeyEquivalentModifierMask:0];
NSMenuItem *stepParentItem = [menu addItemWithTitle:@"Step" action:NULL keyEquivalent:@""]; NSMenuItem *stepParentItem = [menu addItemWithTitle:@"Step" action:NULL keyEquivalent:@""];
NSMenu *stepMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"Step"]; NSMenu *stepMenu = [[NSMenu alloc] initWithTitle:@"Step"];
[stepParentItem setSubmenu:stepMenu]; [stepParentItem setSubmenu:stepMenu];
[stepMenu release]; [stepMenu release];
[[stepMenu addItemWithTitle:@"Into" [[stepMenu addItemWithTitle:@"Into"
@ -81,7 +81,7 @@ NSString *const MAMESaveDebuggerConfigurationNotification = @"MAMESaveDebuggerCo
setKeyEquivalentModifierMask:NSShiftKeyMask]; setKeyEquivalentModifierMask:NSShiftKeyMask];
NSMenuItem *resetParentItem = [menu addItemWithTitle:@"Reset" action:NULL keyEquivalent:@""]; NSMenuItem *resetParentItem = [menu addItemWithTitle:@"Reset" action:NULL keyEquivalent:@""];
NSMenu *resetMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"Reset"]; NSMenu *resetMenu = [[NSMenu alloc] initWithTitle:@"Reset"];
[resetParentItem setSubmenu:resetMenu]; [resetParentItem setSubmenu:resetMenu];
[resetMenu release]; [resetMenu release];
[[resetMenu addItemWithTitle:@"Soft" [[resetMenu addItemWithTitle:@"Soft"
@ -96,7 +96,7 @@ NSString *const MAMESaveDebuggerConfigurationNotification = @"MAMESaveDebuggerCo
[menu addItem:[NSMenuItem separatorItem]]; [menu addItem:[NSMenuItem separatorItem]];
NSMenuItem *newParentItem = [menu addItemWithTitle:@"New" action:NULL keyEquivalent:@""]; NSMenuItem *newParentItem = [menu addItemWithTitle:@"New" action:NULL keyEquivalent:@""];
NSMenu *newMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"New"]; NSMenu *newMenu = [[NSMenu alloc] initWithTitle:@"New"];
[newParentItem setSubmenu:newMenu]; [newParentItem setSubmenu:newMenu];
[newMenu release]; [newMenu release];
[newMenu addItemWithTitle:@"Memory Window" [newMenu addItemWithTitle:@"Memory Window"

2
src/osd/modules/debugger/osx/memoryview.mm
View File

@ -142,7 +142,7 @@
for (auto &ptr : view->source_list()) for (auto &ptr : view->source_list())
{ {
debug_view_memory_source const *const source = downcast<debug_view_memory_source const *>(ptr.get()); debug_view_memory_source const *const source = downcast<debug_view_memory_source const *>(ptr.get());
if (&source->space() == space) if (source->space() == space)
{ {
if (view->source() != source) if (view->source() != source)
{ {

4
src/tools/aueffectutil.mm
View File

@ -772,7 +772,7 @@ static void UpdateChangeCountCallback(
NSMenu *submenu; NSMenu *submenu;
NSString *const appName = [(NSDictionary *)CFBundleGetInfoDictionary(CFBundleGetMainBundle()) objectForKey:@"CFBundleName"]; NSString *const appName = [(NSDictionary *)CFBundleGetInfoDictionary(CFBundleGetMainBundle()) objectForKey:@"CFBundleName"];
NSMenu *const menu = [[NSMenu allocWithZone:[NSMenu zone]] initWithTitle:@"Application"]; NSMenu *const menu = [[NSMenu alloc] initWithTitle:@"Application"];
item = [parent addItemWithTitle:@"Application" action:NULL keyEquivalent:@""]; item = [parent addItemWithTitle:@"Application" action:NULL keyEquivalent:@""];
[parent setSubmenu:menu forItem:item]; [parent setSubmenu:menu forItem:item];
[menu release]; [menu release];
@ -784,7 +784,7 @@ static void UpdateChangeCountCallback(
[menu addItem:[NSMenuItem separatorItem]]; [menu addItem:[NSMenuItem separatorItem]];
item = [menu addItemWithTitle:@"Services" action:NULL keyEquivalent:@""]; item = [menu addItemWithTitle:@"Services" action:NULL keyEquivalent:@""];
submenu = [[NSMenu allocWithZone:[NSMenu zone]] initWithTitle:@"Services"]; submenu = [[NSMenu alloc] initWithTitle:@"Services"];
[menu setSubmenu:submenu forItem:item]; [menu setSubmenu:submenu forItem:item];
[submenu release]; [submenu release];
[NSApp setServicesMenu:submenu]; [NSApp setServicesMenu:submenu];