summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-03-17 12:22:31 +0100
committerCarl Hetherington <cth@carlh.net>2024-03-17 12:45:27 +0100
commitb2591c6a9104eb9368f51f020834aef7713acf29 (patch)
tree6b5b4d87cf284ff3709212119d5a6f2cbaff3a29
parent3a7867650020630d45ea752b5c6a4c4b693b7bcd (diff)
Tidy and fix up the playlist editor menu on macOS.
-rw-r--r--src/tools/dcpomatic_playlist.cc36
1 files 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 {