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, 3 insertions, 3 deletions

diff --git a/src/AlphaMenu.cc b/src/AlphaMenu.cc
index 219d6ea..032e5b3 100644
--- a/src/AlphaMenu.cc
+++ b/src/AlphaMenu.cc
@@ -53,7 +53,7 @@ AlphaMenu::AlphaMenu(FbTk::ThemeProxy<FbTk::MenuTheme> &tm,
 
     m_focused_alpha_item =
         new FbTk::IntMenuItem(focused_alpha_label, m_focused_alpha, 0, 255, *this);
-    insert(m_focused_alpha_item);
+    insertItem(m_focused_alpha_item);
 
     const FbTk::FbString unfocused_alpha_label =
         _FB_XTEXT(Configmenu, UnfocusedAlpha,
@@ -62,14 +62,14 @@ AlphaMenu::AlphaMenu(FbTk::ThemeProxy<FbTk::MenuTheme> &tm,
 
     m_unfocused_alpha_item =
         new FbTk::IntMenuItem(unfocused_alpha_label, m_unfocused_alpha, 0, 255, *this);
-    insert(m_unfocused_alpha_item);
+    insertItem(m_unfocused_alpha_item);
 
     const FbTk::FbString usedefault_label = _FB_XTEXT(Windowmenu, DefaultAlpha,
                                                       "Use Defaults",
                                                       "Default transparency settings for this window");
     FbTk::MenuItem *usedefault_item =
         new AlphaMenuSelectItem(usedefault_label, *this);
-    insert(usedefault_item);
+    insertItem(usedefault_item);
 
     updateMenu();
 }