From 85d8ac754974aae0a513b585e4f1810007cb157c Mon Sep 17 00:00:00 2001
From: Mark Tiefenbruck <mark@fluxbox.org>
Date: Sun, 11 May 2008 09:08:14 -0700
Subject: more useless code

---
 src/MenuCreator.cc | 4 ----
 src/Screen.cc      | 4 ----
 src/Screen.hh      | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc
index b420d3f..3f184f7 100644
--- a/src/MenuCreator.cc
+++ b/src/MenuCreator.cc
@@ -281,10 +281,6 @@ void translateMenuItem(FbTk::Parser &parse, ParseItem &pitem, FbTk::StringConver
         parseMenu(parse, *submenu, labelconvertor);
         submenu->updateMenu();
         menu.insert(str_label, submenu);
-        // save to screen list so we can delete it later
-        BScreen *screen = Fluxbox::instance()->findScreen(screen_number);
-        if (screen != 0)
-            screen->saveMenu(*submenu);
 
     } // end of submenu
     else if (str_key == "stylesdir" || str_key == "stylesmenu") {
diff --git a/src/Screen.cc b/src/Screen.cc
index c94891b..1708a69 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1498,12 +1498,8 @@ void BScreen::initMenus() {
 void BScreen::initMenu() {
 
     if (m_rootmenu.get()) {
-        // since all menus in root is submenus in m_rootmenu
-        // just remove every item in m_rootmenu and then clear m_rootmenu_list
         while (m_rootmenu->numberOfItems())
             m_rootmenu->remove(0);
-        m_rootmenu_list.clear();
-
     } else
         m_rootmenu.reset(createMenu(""));
 
diff --git a/src/Screen.hh b/src/Screen.hh
index 02fcc0d..7758c90 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -276,8 +276,6 @@ public:
 
     void saveWorkspaces(int w) { *resource.workspaces = w;  }
 
-    void saveMenu(FbTk::Menu &menu) { m_rootmenu_list.push_back(&menu); }
-
     FbTk::ThemeProxy<FbWinFrameTheme> &focusedWinFrameTheme() { return *m_focused_windowtheme.get(); }
     const FbTk::ThemeProxy<FbWinFrameTheme> &focusedWinFrameTheme() const { return *m_focused_windowtheme.get(); }
     FbTk::ThemeProxy<FbWinFrameTheme> &unfocusedWinFrameTheme() { return *m_unfocused_windowtheme.get(); }
@@ -521,11 +519,9 @@ private:
 
     ExtraMenus m_extramenus;
 
-    typedef std::list<FbTk::Menu *> Rootmenus;
     typedef std::list<std::pair<FbTk::FbString, FbTk::Menu *> > Configmenus;
 
 
-    Rootmenus m_rootmenu_list;
     Configmenus m_configmenu_list;
     Icons m_icon_list;
 
-- 
cgit v0.11.2