M src/MenuCreator.cc → src/MenuCreator.cc

@@ -281,10 +281,6 @@ 
         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") {

M src/Screen.cc → src/Screen.cc

@@ -1498,12 +1498,8 @@ 
 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(""));
 

M src/Screen.hh → src/Screen.hh

@@ -276,8 +276,6 @@ void saveTabPlacement(FbWinFrame::TabPlacement place) { *resource.tab_placement = place; }
 
     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 @@ std::auto_ptr<FbTk::Menu> m_configmenu, m_rootmenu, m_workspacemenu, m_windowmenu;
 
     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;