From 0b06eea846cc8701bdf30037b73683f7b73cf8e9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 8 Mar 2021 15:19:26 +0100 Subject: [PATCH] (ui_cocoa.m) Cleanups - add fall-throughs --- ui/drivers/ui_cocoa.m | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index 6f0b2e98e3..a69ac4ae80 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -246,30 +246,24 @@ static enum ui_msg_window_response ui_msg_window_cocoa_dialog(ui_msg_window_stat switch (state->buttons) { + case UI_MSG_WINDOW_OKCANCEL: + if (response == NSAlertSecondButtonReturn) + return UI_MSG_RESPONSE_CANCEL; + /* fall-through */ case UI_MSG_WINDOW_OK: if (response == NSAlertFirstButtonReturn) return UI_MSG_RESPONSE_OK; break; - case UI_MSG_WINDOW_OKCANCEL: - if (response == NSAlertFirstButtonReturn) - return UI_MSG_RESPONSE_OK; - if (response == NSAlertSecondButtonReturn) + case UI_MSG_WINDOW_YESNOCANCEL: + if (response == NSAlertThirdButtonReturn) return UI_MSG_RESPONSE_CANCEL; - break; + /* fall-through */ case UI_MSG_WINDOW_YESNO: if (response == NSAlertFirstButtonReturn) return UI_MSG_RESPONSE_YES; if (response == NSAlertSecondButtonReturn) return UI_MSG_RESPONSE_NO; break; - case UI_MSG_WINDOW_YESNOCANCEL: - if (response == NSAlertFirstButtonReturn) - return UI_MSG_RESPONSE_YES; - if (response == NSAlertSecondButtonReturn) - return UI_MSG_RESPONSE_NO; - if (response == NSAlertThirdButtonReturn) - return UI_MSG_RESPONSE_CANCEL; - break; } return UI_MSG_RESPONSE_NA;