diff options
| author | Marcin Kurczewski <rr-@sakuya.pl> | 2018-05-28 21:24:23 +0200 |
|---|---|---|
| committer | Boyuan Yang <byang@debian.org> | 2022-04-27 04:18:47 +0200 |
| commit | fa700c4ce83a6ec2c61b8b0990d3fb79ac44c75a (patch) | |
| tree | d3bb86082414a445a75126b73f1f2521529f79dc | |
| parent | b66522f1c6d7cb15190c9260f42ddec43d92c8ce (diff) | |
[PATCH] Fix MRU menus (#48)
Broken in 9bbfdddde046c151b4ebaa06de10b2d51216cbec. I don't understand
why the author made such a change, so I left their solution with #ifdef
guard.
Gbp-Pq: Name fix-mru-menus.patch
| -rw-r--r-- | src/menu.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/menu.cpp b/src/menu.cpp index 13e054b..99edbcf 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -419,7 +419,7 @@ class AutomationMenu final : public wxMenu { WorkItem *FindOrMakeSubitem(std::string const &name) { auto sub = std::find_if(subitems.begin(), subitems.end(), [&](WorkItem const &item) { return item.displayname == name; }); if (sub != subitems.end()) return &*sub; - + subitems.emplace_back(name); return &subitems.back(); } @@ -529,8 +529,13 @@ namespace menu { } } +#ifdef __WXMAC__ menu->Bind(wxEVT_MENU_OPEN, &CommandManager::OnMenuOpen, &menu->cm); menu->Bind(wxEVT_MENU, &CommandManager::OnMenuClick, &menu->cm); +#else + window->Bind(wxEVT_MENU_OPEN, &CommandManager::OnMenuOpen, &menu->cm); + window->Bind(wxEVT_MENU, &CommandManager::OnMenuClick, &menu->cm); +#endif #ifdef __WXMAC__ bind_events(menu.get()); |