From b2591c6a9104eb9368f51f020834aef7713acf29 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 17 Mar 2024 12:22:31 +0100 Subject: [PATCH] Tidy and fix up the playlist editor menu on macOS. --- src/tools/dcpomatic_playlist.cc | 36 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc index a373d81e6..d092ca513 100644 --- a/src/tools/dcpomatic_playlist.cc +++ b/src/tools/dcpomatic_playlist.cc @@ -567,34 +567,32 @@ private: void setup_menu (wxMenuBar* m) { - auto file = new wxMenu; -#ifdef __WXOSX__ - file->Append(wxID_PREFERENCES, _("&Preferences...\tCtrl-,")); - file->Append (wxID_EXIT, _("&Exit")); +#ifdef DCPOMATIC_OSX + auto help = new wxMenu; + /* These just need to be appended somewhere, it seems - they magically + * get moved to the right place. + */ + help->Append(wxID_PREFERENCES, _("&Preferences...\tCtrl-,")); + help->Append(wxID_EXIT, _("&Exit")); + help->Append(wxID_ABOUT, _("About DCP-o-matic")); + + m->Append(help, _("&Help")); #else - file->Append (wxID_EXIT, _("&Quit")); -#endif + auto file = new wxMenu; + file->Append(wxID_EXIT, _("&Quit")); -#ifndef __WXOSX__ auto edit = new wxMenu; - edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); -#endif + edit->Append(wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); auto help = new wxMenu; -#ifdef __WXOSX__ - help->Append (wxID_ABOUT, _("About DCP-o-matic")); -#else - help->Append (wxID_ABOUT, _("About")); -#endif + help->Append(wxID_ABOUT, _("About")); - m->Append (file, _("&File")); -#ifndef __WXOSX__ - m->Append (edit, _("&Edit")); + m->Append(file, _("&File")); + m->Append(edit, _("&Edit")); + m->Append(help, _("&Help")); #endif - m->Append (help, _("&Help")); } - void config_changed () { try { -- 2.30.2