Simplifying the Menu API a bit

diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp
index 581414e..3e0656f 100644 (file)
--- a/src/gui/menu.cpp
+++ b/src/gui/menu.cpp
@@ -172,9 +172,9 @@ Menu::add_back(const std::string& text)
 }
 
 MenuItem*
-Menu::add_submenu(const std::string& text, int submenu, int id)
+Menu::add_submenu(const std::string& text, int submenu)
 {
-  std::unique_ptr<MenuItem> item(new MenuItem(MN_GOTO, id));
+  std::unique_ptr<MenuItem> item(new MenuItem(MN_GOTO));
   item->text = text;
   item->target_menu = submenu;
   return add_item(std::move(item));

diff --git a/src/gui/menu.hpp b/src/gui/menu.hpp
index 006eda7..80a0428 100644 (file)
--- a/src/gui/menu.hpp
+++ b/src/gui/menu.hpp
@@ -62,7 +62,7 @@ public:
   MenuItem* add_toggle(int id, const std::string& text, bool toggled = false);
   MenuItem* add_inactive(int id, const std::string& text);
   MenuItem* add_back(const std::string& text);
-  MenuItem* add_submenu(const std::string& text, int submenu, int id = -1);
+  MenuItem* add_submenu(const std::string& text, int submenu);
   MenuItem* add_controlfield(int id, const std::string& text,
                              const std::string& mapping = "");
   MenuItem* add_string_select(int id, const std::string& text);