Refactor menu code: be more explicit and compact

This commit is a preparation step for some menu cleanup ahead. To make it
easier to understand which types of MenuItems are added where and when, I
converted the overloaded FbTk::Menu::insert() functions into explicit ones
(Menu::insertSubmenu(), Menu::insertItem(), etc. ). This makes it possible
to just grep for 'insertSubmenu()'.

Side effect this commit: it trims down the very verbose creation of menu items
in regards to how the labels are created.

Minor: FbTk::Menu::shown and FbTk::Menu::s_focused are moved out of the class.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/LayerMenu.cc b/src/LayerMenu.cc
index 94a6622..7617010 100644
--- a/src/LayerMenu.cc
+++ b/src/LayerMenu.cc
@@ -55,10 +55,10 @@ LayerMenu::LayerMenu(FbTk::ThemeProxy<FbTk::MenuTheme> &tm,
     for (size_t i=0; i < 6; ++i) {
         // TODO: fetch nls string
         if (save_rc) {
-            insert(new LayerMenuItem(layer_menuitems[i].default_str,
+            insertItem(new LayerMenuItem(layer_menuitems[i].default_str,
                                      object, layer_menuitems[i].layernum, saverc_cmd));
         } else {
-            insert(new LayerMenuItem(layer_menuitems[i].default_str,
+            insertItem(new LayerMenuItem(layer_menuitems[i].default_str,
                                      object, layer_menuitems[i].layernum));
         }
     }