GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-03 05:20:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Return the wxMenuItem* from append_menu_item, we do need it for some methods.

Browse Source
This commit is contained in:
Joseph Lenox 2018-05-15 20:59:46 -05:00 committed by Joseph Lenox
parent 148316f211
commit 353a7fcaef
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/GUI/misc_ui.hpp
View File

@ -111,8 +111,8 @@ void fatal_error(wxWindow* parent, const wxString& message);
void set_menu_item_icon(wxMenuItem* item, const wxString& icon); void set_menu_item_icon(wxMenuItem* item, const wxString& icon);
template <typename T> template <typename T>
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* 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); wxMenuItem* tmp = menu->Append(wxID_ANY, name, help, kind);
wxAcceleratorEntry* a = new wxAcceleratorEntry(); wxAcceleratorEntry* a = new wxAcceleratorEntry();
if (!accel.IsEmpty()) { if (!accel.IsEmpty()) {
a->FromString(accel); 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)) if (typeid(lambda) != typeid(nullptr))
menu->Bind(wxEVT_MENU, lambda, tmp->GetId(), tmp->GetId()); 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 = ""); wxMenuItem* append_submenu(wxMenu* menu, const wxString& name, const wxString& help, wxMenu* submenu, int id = wxID_ANY, const wxString& icon = "");