From 2af008ecb397a25aed45b7061b05881656949cc7 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Thu, 19 Aug 2021 21:32:44 +0100 Subject: [PATCH] Use the right constant for on/off based on version --- internal/driver/glfw/menu_darwin.m | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/internal/driver/glfw/menu_darwin.m b/internal/driver/glfw/menu_darwin.m index c3f590c8b5..2374fe6fbc 100644 --- a/internal/driver/glfw/menu_darwin.m +++ b/internal/driver/glfw/menu_darwin.m @@ -5,6 +5,15 @@ const int menuTagMin = 5000; +#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400 +NSControlStateValue STATE_ON = NSControlStateValueOn; +NSControlStateValue STATE_OFF = NSControlStateValueOff; +#else +NSControlStateValue STATE_ON = NSOnState; +NSControlStateValue STATE_OFF = NSOffState; +#endif + + extern void menuCallback(int); extern BOOL menuEnabled(int); extern BOOL menuChecked(int); @@ -21,9 +30,9 @@ + (void) tapped:(NSMenuItem*) item { + (BOOL) validateMenuItem:(NSMenuItem*) item { BOOL checked = menuChecked([item tag]-menuTagMin); if (checked) { - [item setState:NSOnState]; + [item setState:STATE_ON]; } else { - [item setState:NSOffState]; + [item setState:STATE_OFF]; } return menuEnabled([item tag]-menuTagMin);