diff --git a/pkg/apple/OSX/en.lproj/MainMenu.xib b/pkg/apple/OSX/en.lproj/MainMenu.xib index a97d13e366..b9d83c4861 100644 --- a/pkg/apple/OSX/en.lproj/MainMenu.xib +++ b/pkg/apple/OSX/en.lproj/MainMenu.xib @@ -657,7 +657,7 @@ 2 {{335, 390}, {480, 360}} 1954021376 - RetroArch + RetroArch_OSX NSWindow @@ -673,7 +673,7 @@ YES - RetroArch + RetroArch_OSX @@ -1714,7 +1714,7 @@ YES - RetroArch + RetroArch_OSX NSObject YES diff --git a/ui/drivers/cocoa/cocoa_common.h b/ui/drivers/cocoa/cocoa_common.h index 222866f5e0..c3b691961c 100644 --- a/ui/drivers/cocoa/cocoa_common.h +++ b/ui/drivers/cocoa/cocoa_common.h @@ -95,7 +95,7 @@ void get_ios_version(int *major, int *minor); @end -@interface RetroArch : NSObject +@interface RetroArch_OSX : NSObject { NSWindow* _window; } diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index 5d0dcc5cd8..3b2f438915 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -154,7 +154,7 @@ void apple_rarch_exited(void) static int waiting_argc; static char** waiting_argv; -@implementation RetroArch +@implementation RetroArch_OSX @synthesize window = _window; @@ -439,7 +439,7 @@ void apple_display_alert(const char *message, const char *title) [alert setMessageText:(*title) ? BOXSTRING(title) : BOXSTRING("RetroArch")]; [alert setInformativeText:BOXSTRING(message)]; [alert setAlertStyle:NSInformationalAlertStyle]; - [alert beginSheetModalForWindow:((RetroArch*)[[NSApplication sharedApplication] delegate]).window + [alert beginSheetModalForWindow:((RetroArch_OSX*)[[NSApplication sharedApplication] delegate]).window modalDelegate:apple_platform didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:nil];