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/Xinerama.hh b/src/Xinerama.hh
index b0ff70e..5d305ed 100644
--- a/src/Xinerama.hh
+++ b/src/Xinerama.hh
@@ -51,7 +51,7 @@ public:
         m_object.saveOnHead(m_headnum);
         FbTk::RadioMenuItem::click(button, time, mods);
     }
-    
+
 private:
     ItemType &m_object;
     int m_headnum;
@@ -103,11 +103,11 @@ void XineramaHeadMenu<ItemType>::reloadHeads()
 */
         std::string tname("Head ");
         tname += FbTk::StringUtil::number2String(i);
-        insert(new XineramaHeadMenuItem<ItemType>(
+        insertItem(new XineramaHeadMenuItem<ItemType>(
                    tname.c_str(), m_object, i, saverc_cmd));
     }
     // TODO: nls
-    insert(new XineramaHeadMenuItem<ItemType>(
+    insertItem(new XineramaHeadMenuItem<ItemType>(
                "All Heads", m_object, 0, saverc_cmd));
     updateMenu();
 }