Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-01-31 17:31:53 +00:00
Code Issues Projects Releases Wiki Activity

refactor pref menu

Browse Source
This commit is contained in:
kanjitalk755 2018-06-19 19:07:14 +09:00
parent 7f8ddaeacf
commit 0e06d9358b
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BasiliskII/src/MacOSX/utils_macosx.mm
View File

@ -41,13 +41,6 @@ void disable_SDL2_macosx_menu_bar_keyboard_shortcuts() {
for (NSMenuItem * menu_item in [NSApp mainMenu].itemArray) { for (NSMenuItem * menu_item in [NSApp mainMenu].itemArray) {
if (menu_item.hasSubmenu) { if (menu_item.hasSubmenu) {
for (NSMenuItem * sub_item in menu_item.submenu.itemArray) { for (NSMenuItem * sub_item in menu_item.submenu.itemArray) {
#ifdef SHEEPSHAVER
if ([sub_item.title isEqualToString:@"Preferences…"]) {
extern id gSheepShaverMain;
sub_item.target = gSheepShaverMain;
sub_item.action = @selector(openPreferences:);
}
#endif
sub_item.keyEquivalent = @""; sub_item.keyEquivalent = @"";
sub_item.keyEquivalentModifierMask = 0; sub_item.keyEquivalentModifierMask = 0;
} }

28
SheepShaver/src/MacOSX/prefs_macosx.mm
View File

@ -108,25 +108,21 @@
* Initialization * Initialization
*/ */
void prefs_init(void)
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
#if SDL_VERSION_ATLEAST(2,0,0) #if SDL_VERSION_ATLEAST(2,0,0)
for (NSMenuItem *sub_item in [NSApp mainMenu].itemArray[0].submenu.itemArray) {
id gSheepShaverMain; if ([sub_item.title isEqualToString:@"Preferences…"]) {
sub_item.target = [[SheepShaverMain alloc] init];
void prefs_init(void) sub_item.action = @selector(openPreferences:);
{ break;
gSheepShaverMain = [[SheepShaverMain alloc] init]; }
} }
#else #else
void prefs_init(void)
{
NSAutoreleasePool *pool;
NSMenu *appMenu; NSMenu *appMenu;
NSMenuItem *menuItem; NSMenuItem *menuItem;
pool = [[NSAutoreleasePool alloc] init];
appMenu = [[[NSApp mainMenu] itemAtIndex:0] submenu]; appMenu = [[[NSApp mainMenu] itemAtIndex:0] submenu];
menuItem = [[NSMenuItem alloc] initWithTitle:@"Preferences..." action:@selector(openPreferences:) keyEquivalent:@","]; menuItem = [[NSMenuItem alloc] initWithTitle:@"Preferences..." action:@selector(openPreferences:) keyEquivalent:@","];
[appMenu insertItem:menuItem atIndex:2]; [appMenu insertItem:menuItem atIndex:2];
@ -134,12 +130,10 @@ void prefs_init(void)
[menuItem release]; [menuItem release];
[NSApp setDelegate:[[SheepShaverMain alloc] init]]; [NSApp setDelegate:[[SheepShaverMain alloc] init]];
#endif
[pool release]; [pool release];
} }
#endif
/* /*
* Deinitialization * Deinitialization
*/ */