aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/MenuCreator.cc4
-rw-r--r--src/Screen.cc4
-rw-r--r--src/Screen.hh4
3 files changed, 0 insertions, 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
281 parseMenu(parse, *submenu, labelconvertor); 281 parseMenu(parse, *submenu, labelconvertor);
282 submenu->updateMenu(); 282 submenu->updateMenu();
283 menu.insert(str_label, submenu); 283 menu.insert(str_label, submenu);
284 // save to screen list so we can delete it later
285 BScreen *screen = Fluxbox::instance()->findScreen(screen_number);
286 if (screen != 0)
287 screen->saveMenu(*submenu);
288 284
289 } // end of submenu 285 } // end of submenu
290 else if (str_key == "stylesdir" || str_key == "stylesmenu") { 286 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() {
1498void BScreen::initMenu() { 1498void BScreen::initMenu() {
1499 1499
1500 if (m_rootmenu.get()) { 1500 if (m_rootmenu.get()) {
1501 // since all menus in root is submenus in m_rootmenu
1502 // just remove every item in m_rootmenu and then clear m_rootmenu_list
1503 while (m_rootmenu->numberOfItems()) 1501 while (m_rootmenu->numberOfItems())
1504 m_rootmenu->remove(0); 1502 m_rootmenu->remove(0);
1505 m_rootmenu_list.clear();
1506
1507 } else 1503 } else
1508 m_rootmenu.reset(createMenu("")); 1504 m_rootmenu.reset(createMenu(""));
1509 1505
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:
276 276
277 void saveWorkspaces(int w) { *resource.workspaces = w; } 277 void saveWorkspaces(int w) { *resource.workspaces = w; }
278 278
279 void saveMenu(FbTk::Menu &menu) { m_rootmenu_list.push_back(&menu); }
280
281 FbTk::ThemeProxy<FbWinFrameTheme> &focusedWinFrameTheme() { return *m_focused_windowtheme.get(); } 279 FbTk::ThemeProxy<FbWinFrameTheme> &focusedWinFrameTheme() { return *m_focused_windowtheme.get(); }
282 const FbTk::ThemeProxy<FbWinFrameTheme> &focusedWinFrameTheme() const { return *m_focused_windowtheme.get(); } 280 const FbTk::ThemeProxy<FbWinFrameTheme> &focusedWinFrameTheme() const { return *m_focused_windowtheme.get(); }
283 FbTk::ThemeProxy<FbWinFrameTheme> &unfocusedWinFrameTheme() { return *m_unfocused_windowtheme.get(); } 281 FbTk::ThemeProxy<FbWinFrameTheme> &unfocusedWinFrameTheme() { return *m_unfocused_windowtheme.get(); }
@@ -521,11 +519,9 @@ private:
521 519
522 ExtraMenus m_extramenus; 520 ExtraMenus m_extramenus;
523 521
524 typedef std::list<FbTk::Menu *> Rootmenus;
525 typedef std::list<std::pair<FbTk::FbString, FbTk::Menu *> > Configmenus; 522 typedef std::list<std::pair<FbTk::FbString, FbTk::Menu *> > Configmenus;
526 523
527 524
528 Rootmenus m_rootmenu_list;
529 Configmenus m_configmenu_list; 525 Configmenus m_configmenu_list;
530 Icons m_icon_list; 526 Icons m_icon_list;
531 527