remove menu modes

3 files changed, 1 insertions, 10 deletions

diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 7cb5599..a61bbc7 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -994,7 +994,7 @@ void Menu::motionNotifyEvent(XMotionEvent &me) {
 
         }
 
-        if (itmp->submenu() && theme()->menuMode() == MenuTheme::DELAY_OPEN) {
+        if (itmp->submenu()) {
             // start submenu open delay
             timeval timeout;
             timeout.tv_sec = 0;
diff --git a/src/FbTk/MenuTheme.cc b/src/FbTk/MenuTheme.cc
index 12aee4d..b6e8f93 100644
--- a/src/FbTk/MenuTheme.cc
+++ b/src/FbTk/MenuTheme.cc
@@ -72,7 +72,6 @@ MenuTheme::MenuTheme(int screen_num):
     d_text_gc(RootWindow(m_display, screen_num)),
     hilite_gc(RootWindow(m_display, screen_num)),
     m_alpha(255),
-    m_menumode(DELAY_OPEN),
     m_delayopen(0), // no delay as default
     m_delayclose(0), // no delay as default
     m_real_title_height(*m_title_height),
diff --git a/src/FbTk/MenuTheme.hh b/src/FbTk/MenuTheme.hh
index 70fc9b8..59fcbaf 100644
--- a/src/FbTk/MenuTheme.hh
+++ b/src/FbTk/MenuTheme.hh
@@ -34,11 +34,6 @@ namespace FbTk {
 
 class MenuTheme: public Theme, public ThemeProxy<MenuTheme> {
 public:
-    //!! TODO
-    // this isn't actually used with a theme item
-    // see setMenuMode() for more info
-    enum MenuMode {CLICK_OPEN, DELAY_OPEN};
-
     enum BulletType { EMPTY, SQUARE, TRIANGLE, DIAMOND};
     MenuTheme(int screen_num);
     virtual ~MenuTheme();
@@ -116,8 +111,6 @@ public:
     // this isn't actually a theme item
     // but we'll let it be here for now, until there's a better way to
     // get resources into menu
-    void setMenuMode(MenuMode mode) { m_menumode = mode; }
-    MenuMode menuMode() const { return m_menumode; }
     void setDelayOpen(int msec) { m_delayopen = msec; }
     void setDelayClose(int msec) { m_delayclose = msec; }
     int delayOpen() const { return m_delayopen; }
@@ -164,7 +157,6 @@ private:
     GContext t_text_gc, f_text_gc, u_text_gc, h_text_gc, d_text_gc, hilite_gc;
 
     unsigned char m_alpha;
-    MenuMode m_menumode;
     unsigned int m_delayopen; ///< in msec
     unsigned int m_delayclose; ///< in msec
     unsigned int m_real_title_height; ///< the calculated item height (from font and menu.titleHeight)