diff --git a/ui/drivers/cocoa/cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m index 1ce96d0e29..27e8a751e0 100644 --- a/ui/drivers/cocoa/cocoa_common.m +++ b/ui/drivers/cocoa/cocoa_common.m @@ -18,29 +18,6 @@ #include #include "cocoa_common.h" -void apple_display_alert(const char *message, const char *title) -{ -#if defined(HAVE_COCOATOUCH) - UIAlertView* alert = [[UIAlertView alloc] initWithTitle:BOXSTRING(title) - message:BOXSTRING(message) - delegate:nil - cancelButtonTitle:BOXSTRING("OK") - otherButtonTitles:nil]; - [alert show]; -#else - NSAlert* alert = [[NSAlert new] autorelease]; - - [alert setMessageText:(*title) ? BOXSTRING(title) : BOXSTRING("RetroArch")]; - [alert setInformativeText:BOXSTRING(message)]; - [alert setAlertStyle:NSInformationalAlertStyle]; - [alert beginSheetModalForWindow:[RetroArch_OSX get].window - modalDelegate:apple_platform - didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) - contextInfo:nil]; - [[NSApplication sharedApplication] runModalForWindow:[alert window]]; -#endif -} - // Number formatter class for setting strings @implementation RANumberFormatter - (id)initWithSetting:(const rarch_setting_t*)setting diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index 056cd68312..7a753b32c1 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -411,6 +411,20 @@ int main(int argc, char *argv[]) return NSApplicationMain(argc, (const char **) argv); } +void apple_display_alert(const char *message, const char *title) +{ + NSAlert* alert = [[NSAlert new] autorelease]; + + [alert setMessageText:(*title) ? BOXSTRING(title) : BOXSTRING("RetroArch")]; + [alert setInformativeText:BOXSTRING(message)]; + [alert setAlertStyle:NSInformationalAlertStyle]; + [alert beginSheetModalForWindow:[RetroArch_OSX get].window + modalDelegate:apple_platform + didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) + contextInfo:nil]; + [[NSApplication sharedApplication] runModalForWindow:[alert window]]; +} + typedef struct ui_companion_cocoa { void *empty; diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m index 1ed008e303..66a22dc49f 100644 --- a/ui/drivers/ui_cocoatouch.m +++ b/ui/drivers/ui_cocoatouch.m @@ -461,6 +461,16 @@ int main(int argc, char *argv[]) } } +void apple_display_alert(const char *message, const char *title) +{ + UIAlertView* alert = [[UIAlertView alloc] initWithTitle:BOXSTRING(title) + message:BOXSTRING(message) + delegate:nil + cancelButtonTitle:BOXSTRING("OK") + otherButtonTitles:nil]; + [alert show]; +} + typedef struct ui_companion_cocoatouch { void *empty;