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

diff --git a/src/ClockTool.cc b/src/ClockTool.cc
index f2a7333..893d32b 100644
--- a/src/ClockTool.cc
+++ b/src/ClockTool.cc
@@ -37,11 +37,7 @@
 #include "FbTk/I18n.hh"
 #include "FbTk/FbTime.hh"
 
-#ifdef HAVE_CTIME
-  #include <ctime>
-#else
-  #include <time.h>
-#endif
+#include <ctime>
 #include <typeinfo>
 #include <cstdio>
 
@@ -171,9 +167,9 @@ ClockTool::ClockTool(const FbTk::FbWindow &parent,
     FbTk::RefCount<FbTk::Command<void> > saverc(FbTk::CommandParser<void>::instance().parse("saverc"));
     FbTk::MenuItem *item = new ClockMenuItem(*this);
     item->setCommand(saverc);
-    menu.insert(item);
+    menu.insertItem(item);
     FbTk::RefCount<FbTk::Command<void> > editformat_cmd(new EditClockFormatCmd());
-    menu.insert(_FB_XTEXT(Toolbar, ClockEditFormat,   "Edit Clock Format",   "edit Clock Format") , editformat_cmd);
+    menu.insertCommand(_FB_XTEXT(Toolbar, ClockEditFormat,   "Edit Clock Format",   "edit Clock Format") , editformat_cmd);
 
     updateTime();
 }