From f041db9c4d34d389f369122ebf87dfacfd7ba64e Mon Sep 17 00:00:00 2001 From: Mark Kim Date: Sat, 4 Jun 2022 22:34:16 -0400 Subject: [PATCH] Localization of SDL2.0 menu on macOS. SDL2 initializes the macOS menu later than SDL1 (appears to be done around the video initialization time), so we also need to call later our routine to override the SDL menu with our localizable version. --- docs/CHANGES.txt | 6 ++++++ src/tuxpaint.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 2e906df26..02a3d253c 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -279,6 +279,12 @@ http://www.tuxpaint.org/ different keycodes, so the backspace requires special handling on the macOS in programs writtens for the PC. + * Remove the `--openfolder` option when calling `bless` from Apple + Silicon. This option is no longer valid on Apple Silicon as of the + March 2022 release of Xcode. + + * Localization of SDL2.0 menu on macOS. + * Documentation updates: --------------------- * Added some styling, use of HTML semantic tags, call-outs for notes, diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 4ccd29e60..2dd5a5d3f 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -27329,10 +27329,6 @@ static void setup(void) } #endif -#ifdef __APPLE__ - apple_init(); -#endif - im_init(&im_data, get_current_language()); #ifndef NO_SDLPANGO @@ -28473,6 +28469,10 @@ static void setup(void) signal(SIGUSR1, signal_handler); signal(SIGUSR2, signal_handler); #endif + +#ifdef __APPLE__ + apple_init(); +#endif } /* ================================================================================== */