nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more useless code

Browse source
This commit is contained in:
Mark Tiefenbruck 2008-05-11 09:08:14 -07:00
parent a9fd0f5b26
commit 85d8ac7549
3 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/MenuCreator.cc
View file

@ -281,10 +281,6 @@ void translateMenuItem(FbTk::Parser &parse, ParseItem &pitem, FbTk::StringConver
parseMenu(parse, *submenu, labelconvertor); parseMenu(parse, *submenu, labelconvertor);
submenu->updateMenu(); submenu->updateMenu();
menu.insert(str_label, submenu); 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 } // end of submenu
else if (str_key == "stylesdir" || str_key == "stylesmenu") { else if (str_key == "stylesdir" || str_key == "stylesmenu") {

4
src/Screen.cc
View file

@ -1498,12 +1498,8 @@ void BScreen::initMenus() {
void BScreen::initMenu() { void BScreen::initMenu() {
if (m_rootmenu.get()) { 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()) while (m_rootmenu->numberOfItems())
m_rootmenu->remove(0); m_rootmenu->remove(0);
m_rootmenu_list.clear();
} else } else
m_rootmenu.reset(createMenu("")); m_rootmenu.reset(createMenu(""));

4
src/Screen.hh
View file

@ -276,8 +276,6 @@ public:
void saveWorkspaces(int w) { *resource.workspaces = w; } 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(); } FbTk::ThemeProxy<FbWinFrameTheme> &focusedWinFrameTheme() { return *m_focused_windowtheme.get(); }
const FbTk::ThemeProxy<FbWinFrameTheme> &focusedWinFrameTheme() const { 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(); } FbTk::ThemeProxy<FbWinFrameTheme> &unfocusedWinFrameTheme() { return *m_unfocused_windowtheme.get(); }
@ -521,11 +519,9 @@ private:
ExtraMenus m_extramenus; ExtraMenus m_extramenus;
typedef std::list<FbTk::Menu *> Rootmenus;
typedef std::list<std::pair<FbTk::FbString, FbTk::Menu *> > Configmenus; typedef std::list<std::pair<FbTk::FbString, FbTk::Menu *> > Configmenus;
Rootmenus m_rootmenu_list;
Configmenus m_configmenu_list; Configmenus m_configmenu_list;
Icons m_icon_list; Icons m_icon_list;