From 353a7fcaef129d63bf1337106ec13059fe0cc06e Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Tue, 15 May 2018 20:59:46 -0500 Subject: [PATCH] Return the wxMenuItem* from append_menu_item, we do need it for some methods. --- src/GUI/misc_ui.hpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/GUI/misc_ui.hpp b/src/GUI/misc_ui.hpp index e592618ea..79f6fd2dc 100644 --- a/src/GUI/misc_ui.hpp +++ b/src/GUI/misc_ui.hpp @@ -111,8 +111,8 @@ void fatal_error(wxWindow* parent, const wxString& message); void set_menu_item_icon(wxMenuItem* item, const wxString& icon); template -void append_menu_item(wxMenu* menu, const wxString& name,const wxString& help, T lambda, int id = wxID_ANY, const wxString& icon = "", const wxString& accel = "") { - wxMenuItem* tmp = menu->Append(wxID_ANY, name, help); +wxMenuItem* append_menu_item(wxMenu* menu, const wxString& name,const wxString& help, T lambda, int id = wxID_ANY, const wxString& icon = "", const wxString& accel = "", const wxItemKind kind = wxITEM_NORMAL) { + wxMenuItem* tmp = menu->Append(wxID_ANY, name, help, kind); wxAcceleratorEntry* a = new wxAcceleratorEntry(); if (!accel.IsEmpty()) { a->FromString(accel); @@ -123,6 +123,8 @@ void append_menu_item(wxMenu* menu, const wxString& name,const wxString& help, T if (typeid(lambda) != typeid(nullptr)) menu->Bind(wxEVT_MENU, lambda, tmp->GetId(), tmp->GetId()); + + return tmp; } wxMenuItem* append_submenu(wxMenu* menu, const wxString& name, const wxString& help, wxMenu* submenu, int id = wxID_ANY, const wxString& icon = "");