From 7c90bc592ff78292244b7ab7b127ed5957ce5abf Mon Sep 17 00:00:00 2001 From: rogerman Date: Wed, 13 Apr 2022 15:42:25 -0700 Subject: [PATCH] Cocoa Port: Fix broken settings sheets for Input Preferences when running on pre-Mavericks macOS. (Regression from commit e9b3998f, also related to commit 8f20237c.) --- .../frontend/cocoa/userinterface/inputPrefsView.mm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/desmume/src/frontend/cocoa/userinterface/inputPrefsView.mm b/desmume/src/frontend/cocoa/userinterface/inputPrefsView.mm index d9c246285..264a39a0a 100644 --- a/desmume/src/frontend/cocoa/userinterface/inputPrefsView.mm +++ b/desmume/src/frontend/cocoa/userinterface/inputPrefsView.mm @@ -850,17 +850,7 @@ const NSInteger code = [CocoaDSUtil getIBActionSenderTag:sender]; [sheet makeFirstResponder:nil]; // Force end of editing of any text fields. - -#if defined(MAC_OS_X_VERSION_10_9) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9) - if ([[sheet sheetParent] respondsToSelector:@selector(endSheet:returnCode:)]) - { - [[sheet sheetParent] endSheet:sheet returnCode:code]; - } - else -#endif - { - [NSApp endSheet:sheet returnCode:code]; - } + [CocoaDSUtil endSheet:sheet returnCode:code]; } - (IBAction) updateCustomTurboPatternControls:(id)sender