diff options
| author | B Stack <bgstack15@gmail.com> | 2018-10-17 02:11:26 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2018-10-17 02:11:26 +0000 |
| commit | f70f8f961ef8f4d909266f71310e3515f25928e6 (patch) | |
| tree | 89b2a018482c164bdd8ecac5c76b19a08f420dec /wx+/context_menu.h | |
| parent | Merge branch '10.4' into 'master' (diff) | |
| parent | 10.5 (diff) | |
| download | FreeFileSync-f70f8f961ef8f4d909266f71310e3515f25928e6.tar.gz FreeFileSync-f70f8f961ef8f4d909266f71310e3515f25928e6.tar.bz2 FreeFileSync-f70f8f961ef8f4d909266f71310e3515f25928e6.zip | |
Merge branch '10.5' into 'master'10.5
10.5
See merge request opensource-tracking/FreeFileSync!2
Diffstat (limited to 'wx+/context_menu.h')
| -rwxr-xr-x | wx+/context_menu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wx+/context_menu.h b/wx+/context_menu.h index 7f459aca..d856db03 100755 --- a/wx+/context_menu.h +++ b/wx+/context_menu.h @@ -72,8 +72,8 @@ public: void popup(wxWindow& wnd, const wxPoint& pos = wxDefaultPosition) //show popup menu + process lambdas { //eventually all events from submenu items will be received by this menu - for (const auto& item : commandList_) - menu_->Connect(item.first, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ContextMenu::onSelection), new GenericCommand(item.second) /*pass ownership*/, this); + for (const auto& [itemId, command] : commandList_) + menu_->Connect(itemId, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ContextMenu::onSelection), new GenericCommand(command) /*pass ownership*/, this); wnd.PopupMenu(menu_.get(), pos); wxTheApp->ProcessPendingEvents(); //make sure lambdas are evaluated before going out of scope; |