aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormathias <mathias>2004-12-13 14:03:17 (GMT)
committermathias <mathias>2004-12-13 14:03:17 (GMT)
commiteb42a7806d0af854cc4bdfa8f194a0bb67446153 (patch)
tree5a8a22b0705ee927a16265f1a754159835fb22d9 /src
parent7c7dfbfbddc635faaabb87fa755925fbb66d89dd (diff)
downloadfluxbox-eb42a7806d0af854cc4bdfa8f194a0bb67446153.zip
fluxbox-eb42a7806d0af854cc4bdfa8f194a0bb67446153.tar.bz2
icc complaint about a "possible" conflict between the
FbTk::Menu::update(Subject*) and FbTk::Menu::update(int index) to avoid this, we rename FbTk::Menu::update(int index) -> FbTk::Menu::updateMenu(int index) this is mostly cosmetic, but if it makes the life of a compiler happy, well .. be happy icc :)
Diffstat (limited to 'src')
-rw-r--r--src/Container.hh2
-rw-r--r--src/FbMenu.cc4
-rw-r--r--src/FbMenu.hh2
-rw-r--r--src/FbTk/Menu.cc12
-rw-r--r--src/FbTk/Menu.hh2
-rw-r--r--src/FbTk/Theme.hh3
-rw-r--r--src/IconButton.cc1
-rw-r--r--src/IconMenu.cc2
-rw-r--r--src/IconbarTool.cc4
-rw-r--r--src/LayerMenu.hh2
-rw-r--r--src/MenuCreator.cc8
-rw-r--r--src/Remember.cc4
-rw-r--r--src/Screen.cc8
-rw-r--r--src/SendToMenu.cc6
-rw-r--r--src/Slit.cc6
-rw-r--r--src/Toolbar.cc4
-rw-r--r--src/Workspace.cc6
-rw-r--r--src/WorkspaceMenu.cc8
-rw-r--r--src/Xinerama.hh2
19 files changed, 45 insertions, 41 deletions
diff --git a/src/Container.hh b/src/Container.hh
index 3b05385..d6c34ed 100644
--- a/src/Container.hh
+++ b/src/Container.hh
@@ -69,7 +69,7 @@ public:
69 inline Alignment alignment() const { return m_align; } 69 inline Alignment alignment() const { return m_align; }
70 inline int size() const { return m_item_list.size(); } 70 inline int size() const { return m_item_list.size(); }
71 inline bool empty() const { return m_item_list.empty(); } 71 inline bool empty() const { return m_item_list.empty(); }
72 inline const Item selected() const { return m_selected; } 72 inline const Item& selected() const { return m_selected; }
73 inline Item selected() { return m_selected; } 73 inline Item selected() { return m_selected; }
74 unsigned int maxWidthPerClient() const; 74 unsigned int maxWidthPerClient() const;
75 inline unsigned int maxHeightPerClient() const { return (empty() ? height() : height()/size()); } 75 inline unsigned int maxHeightPerClient() const { return (empty() ? height() : height()/size()); }
diff --git a/src/FbMenu.cc b/src/FbMenu.cc
index e1e3c7b..5105bc9 100644
--- a/src/FbMenu.cc
+++ b/src/FbMenu.cc
@@ -39,8 +39,8 @@ FbMenu::~FbMenu() {
39 39
40} 40}
41 41
42void FbMenu::update(int index) { 42void FbMenu::updateMenu(int index) {
43 FbTk::Menu::update(index); 43 FbTk::Menu::updateMenu(index);
44 m_shape->update(); 44 m_shape->update();
45} 45}
46 46
diff --git a/src/FbMenu.hh b/src/FbMenu.hh
index ec1b401..66cb462 100644
--- a/src/FbMenu.hh
+++ b/src/FbMenu.hh
@@ -36,7 +36,7 @@ public:
36 FbMenu(MenuTheme &tm, FbTk::ImageControl &imgctrl, 36 FbMenu(MenuTheme &tm, FbTk::ImageControl &imgctrl,
37 FbTk::XLayer &layer); 37 FbTk::XLayer &layer);
38 virtual ~FbMenu(); 38 virtual ~FbMenu();
39 void update(int index = -1); 39 void updateMenu(int index = -1);
40 void clearWindow(); 40 void clearWindow();
41 void raise() { m_layeritem.raise(); } 41 void raise() { m_layeritem.raise(); }
42 void lower() { m_layeritem.lower(); } 42 void lower() { m_layeritem.lower(); }
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 2460951..7cf076b 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -398,13 +398,13 @@ void Menu::enableTitle() {
398 setTitleVisibility(true); 398 setTitleVisibility(true);
399} 399}
400 400
401void Menu::update(int active_index) { 401void Menu::updateMenu(int active_index) {
402 if (title_vis) { 402 if (title_vis) {
403 menu.item_w = theme().titleFont().textWidth(menu.label.c_str(), 403 menu.item_w = theme().titleFont().textWidth(menu.label.c_str(),
404 menu.label.size()); 404 menu.label.size());
405 405
406 menu.item_w += (theme().bevelWidth() * 2); 406 menu.item_w += (theme().bevelWidth() * 2);
407 } else 407 } else
408 menu.item_w = 1; 408 menu.item_w = 1;
409 409
410 unsigned int ii = 0; 410 unsigned int ii = 0;
@@ -626,7 +626,7 @@ void Menu::update(int active_index) {
626void Menu::show() { 626void Menu::show() {
627 627
628 if (m_need_update) 628 if (m_need_update)
629 update(); 629 updateMenu();
630 630
631 menu.window.showSubwindows(); 631 menu.window.showSubwindows();
632 menu.window.show(); 632 menu.window.show();
@@ -677,7 +677,7 @@ void Menu::clearWindow() {
677 if (alpha() < 255) { 677 if (alpha() < 255) {
678 renderTransp(0, 0, 678 renderTransp(0, 0,
679 menu.frame.width(), menu.frame.height()); 679 menu.frame.width(), menu.frame.height());
680 update(); 680 updateMenu();
681 } 681 }
682 682
683 menu.title.clear(); 683 menu.title.clear();
@@ -1368,7 +1368,7 @@ void Menu::keyPressEvent(XKeyEvent &event) {
1368 menuitems[which_press]->click(1, event.time); 1368 menuitems[which_press]->click(1, event.time);
1369 itemSelected(1, which_press); 1369 itemSelected(1, which_press);
1370 m_need_update = true; 1370 m_need_update = true;
1371 update(); 1371 updateMenu();
1372 } 1372 }
1373 break; 1373 break;
1374 default: 1374 default:
@@ -1413,7 +1413,7 @@ void Menu::reconfigure() {
1413 menu.title.setBorderWidth(theme().borderWidth()); 1413 menu.title.setBorderWidth(theme().borderWidth());
1414 1414
1415 1415
1416 update(); 1416 updateMenu();
1417 1417
1418} 1418}
1419 1419
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 04b440c..423b80a 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -117,7 +117,7 @@ public:
117 void setLabel(const char *labelstr); 117 void setLabel(const char *labelstr);
118 /// move menu to x,y 118 /// move menu to x,y
119 void move(int x, int y); 119 void move(int x, int y);
120 virtual void update(int active_index = -1); 120 virtual void updateMenu(int active_index = -1);
121 void setItemSelected(unsigned int index, bool val); 121 void setItemSelected(unsigned int index, bool val);
122 void setItemEnabled(unsigned int index, bool val); 122 void setItemEnabled(unsigned int index, bool val);
123 inline void setMinimumSublevels(int m) { menu.minsub = m; } 123 inline void setMinimumSublevels(int m) { menu.minsub = m; }
diff --git a/src/FbTk/Theme.hh b/src/FbTk/Theme.hh
index 7b83122..338c24b 100644
--- a/src/FbTk/Theme.hh
+++ b/src/FbTk/Theme.hh
@@ -135,6 +135,9 @@ public:
135 135
136 bool verbose() const { return m_verbose; } 136 bool verbose() const { return m_verbose; }
137 void setVerbose(bool value) { m_verbose = value; } 137 void setVerbose(bool value) { m_verbose = value; }
138
139 // dump theme out to filename, stdout if no filename is given
140 void dump(Theme& theme, const char* filename = 0) const;
138 // void listItems(); 141 // void listItems();
139private: 142private:
140 ThemeManager(); 143 ThemeManager();
diff --git a/src/IconButton.cc b/src/IconButton.cc
index 459b4be..24bdddf 100644
--- a/src/IconButton.cc
+++ b/src/IconButton.cc
@@ -86,6 +86,7 @@ public:
86 break; 86 break;
87 case IconbarTool::CURRENT: 87 case IconbarTool::CURRENT:
88 m_win.screen().sendToWorkspace(m_win.screen().currentWorkspaceID(), &m_win); 88 m_win.screen().sendToWorkspace(m_win.screen().currentWorkspaceID(), &m_win);
89 m_win.raiseAndFocus();
89 break; 90 break;
90 case IconbarTool::FOLLOW: 91 case IconbarTool::FOLLOW:
91 default: 92 default:
diff --git a/src/IconMenu.cc b/src/IconMenu.cc
index bc88114..8816e67 100644
--- a/src/IconMenu.cc
+++ b/src/IconMenu.cc
@@ -40,7 +40,7 @@ static void updateItems(FbTk::Menu &menu, BScreen &screen) {
40 for (; client_it != client_it_end; ++client_it) 40 for (; client_it != client_it_end; ++client_it)
41 menu.insert(new IconMenuItem(**client_it)); 41 menu.insert(new IconMenuItem(**client_it));
42 } 42 }
43 menu.update(); 43 menu.updateMenu();
44} 44}
45 45
46IconMenu::IconMenu(BScreen &screen): 46IconMenu::IconMenu(BScreen &screen):
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index 31f1b34..4ea3d1b 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -277,7 +277,7 @@ void setupModeMenu(FbTk::Menu &menu, IconbarTool &handler) {
277 277
278 menu.insert(new FbTk::MenuSeparator()); 278 menu.insert(new FbTk::MenuSeparator());
279 279
280 menu.update(); 280 menu.updateMenu();
281} 281}
282 282
283inline bool checkAddWindow(IconbarTool::Mode mode, const FluxboxWindow &win) { 283inline bool checkAddWindow(IconbarTool::Mode mode, const FluxboxWindow &win) {
@@ -367,7 +367,7 @@ IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme, BScr
367 RefCount<Command> s_and_reconfig(save_and_reconfig); 367 RefCount<Command> s_and_reconfig(save_and_reconfig);
368 m_menu.insert(new BoolMenuItem(_FBTEXT(Toolbar, ShowIcons, "Show Pictures", "chooses if little icons are shown next to title in the iconbar") , 368 m_menu.insert(new BoolMenuItem(_FBTEXT(Toolbar, ShowIcons, "Show Pictures", "chooses if little icons are shown next to title in the iconbar") ,
369 *m_rc_use_pixmap, s_and_reconfig)); 369 *m_rc_use_pixmap, s_and_reconfig));
370 m_menu.update(); 370 m_menu.updateMenu();
371 // must be internal menu, otherwise toolbar main menu tries to delete it. 371 // must be internal menu, otherwise toolbar main menu tries to delete it.
372 m_menu.setInternalMenu(); 372 m_menu.setInternalMenu();
373 373
diff --git a/src/LayerMenu.hh b/src/LayerMenu.hh
index bfb60e6..af7f8f7 100644
--- a/src/LayerMenu.hh
+++ b/src/LayerMenu.hh
@@ -109,7 +109,7 @@ LayerMenu<ItemType>::LayerMenu(MenuTheme &tm, FbTk::ImageControl &imgctrl,
109 m_object, layer_menuitems[i].layernum)); 109 m_object, layer_menuitems[i].layernum));
110 } 110 }
111 } 111 }
112 update(); 112 updateMenu();
113} 113}
114 114
115#endif // LAYERMENU_HH 115#endif // LAYERMENU_HH
diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc
index 829a8a4..ca36eef 100644
--- a/src/MenuCreator.cc
+++ b/src/MenuCreator.cc
@@ -89,7 +89,7 @@ static void createStyleMenu(FbTk::Menu &parent, const std::string &label,
89 parent.insert(new StyleMenuItem(filelist[file_index], style)); 89 parent.insert(new StyleMenuItem(filelist[file_index], style));
90 } 90 }
91 // update menu graphics 91 // update menu graphics
92 parent.update(); 92 parent.updateMenu();
93 Fluxbox::instance()->saveMenuFilename(stylesdir.c_str()); 93 Fluxbox::instance()->saveMenuFilename(stylesdir.c_str());
94 94
95} 95}
@@ -124,7 +124,7 @@ static void createRootCmdMenu(FbTk::Menu &parent, const string &label,
124 parent.insert(new RootCmdMenuItem(filelist[file_index], rootcmd, cmd)); 124 parent.insert(new RootCmdMenuItem(filelist[file_index], rootcmd, cmd));
125 } 125 }
126 // update menu graphics 126 // update menu graphics
127 parent.update(); 127 parent.updateMenu();
128 Fluxbox::instance()->saveMenuFilename(rootcmddir.c_str()); 128 Fluxbox::instance()->saveMenuFilename(rootcmddir.c_str());
129 129
130} 130}
@@ -270,7 +270,7 @@ static void translateMenuItem(Parser &parse, ParseItem &pitem) {
270 submenu->setLabel(str_label.c_str()); 270 submenu->setLabel(str_label.c_str());
271 271
272 parseMenu(parse, *submenu); 272 parseMenu(parse, *submenu);
273 submenu->update(); 273 submenu->updateMenu();
274 menu.insert(str_label.c_str(), submenu); 274 menu.insert(str_label.c_str(), submenu);
275 // save to screen list so we can delete it later 275 // save to screen list so we can delete it later
276 BScreen *screen = Fluxbox::instance()->findScreen(screen_number); 276 BScreen *screen = Fluxbox::instance()->findScreen(screen_number);
@@ -339,7 +339,7 @@ static void parseWindowMenu(Parser &parse, FbTk::Menu &menu, FluxboxWindow &win)
339 } else if (pitem.key() == "submenu") { 339 } else if (pitem.key() == "submenu") {
340 FbTk::Menu *submenu = MenuCreator::createMenu(pitem.label(), menu.screenNumber()); 340 FbTk::Menu *submenu = MenuCreator::createMenu(pitem.label(), menu.screenNumber());
341 parseWindowMenu(parse, *submenu, win); 341 parseWindowMenu(parse, *submenu, win);
342 submenu->update(); 342 submenu->updateMenu();
343 menu.insert(pitem.label().c_str(), submenu); 343 menu.insert(pitem.label().c_str(), submenu);
344 344
345 } else { // try non window menu specific stuff 345 } else { // try non window menu specific stuff
diff --git a/src/Remember.cc b/src/Remember.cc
index 9a23082..e74ace2 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -123,7 +123,7 @@ FbTk::Menu *createRememberMenu(Remember &remember, FluxboxWindow &win, bool enab
123 FbTk::MenuItem *item = new FbTk::MenuItem("unavailable"); 123 FbTk::MenuItem *item = new FbTk::MenuItem("unavailable");
124 item->setEnabled(false); 124 item->setEnabled(false);
125 menu->insert(item); 125 menu->insert(item);
126 menu->update(); 126 menu->updateMenu();
127 return menu; 127 return menu;
128 } 128 }
129 129
@@ -147,7 +147,7 @@ FbTk::Menu *createRememberMenu(Remember &remember, FluxboxWindow &win, bool enab
147 menu->insert(new RememberMenuItem(_FBTEXT(Remember, SaveOnClose, "Save on close", "Save remembered attributes on close"), 147 menu->insert(new RememberMenuItem(_FBTEXT(Remember, SaveOnClose, "Save on close", "Save remembered attributes on close"),
148 remember, win, Remember::REM_SAVEONCLOSE)); 148 remember, win, Remember::REM_SAVEONCLOSE));
149 149
150 menu->update(); 150 menu->updateMenu();
151 return menu; 151 return menu;
152}; 152};
153 153
diff --git a/src/Screen.cc b/src/Screen.cc
index f125f7f..9c0493b 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1704,7 +1704,7 @@ void BScreen::initMenu() {
1704 exit_fb); 1704 exit_fb);
1705 } 1705 }
1706 1706
1707 m_rootmenu->update(); 1707 m_rootmenu->updateMenu();
1708} 1708}
1709 1709
1710 1710
@@ -1765,7 +1765,7 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
1765 *resource.auto_raise, 1765 *resource.auto_raise,
1766 save_and_reconfigure)); 1766 save_and_reconfigure));
1767 1767
1768 focus_menu->update(); 1768 focus_menu->updateMenu();
1769 1769
1770 menu.insert(focusmenu_label, focus_menu); 1770 menu.insert(focusmenu_label, focus_menu);
1771#ifdef SLIT 1771#ifdef SLIT
@@ -1845,14 +1845,14 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
1845 menu_alpha_item->setCommand(saverc_cmd); 1845 menu_alpha_item->setCommand(saverc_cmd);
1846 alpha_menu->insert(menu_alpha_item); 1846 alpha_menu->insert(menu_alpha_item);
1847 1847
1848 alpha_menu->update(); 1848 alpha_menu->updateMenu();
1849 menu.insert(alphamenu_label, alpha_menu); 1849 menu.insert(alphamenu_label, alpha_menu);
1850 } 1850 }
1851#endif // HAVE_XRENDER 1851#endif // HAVE_XRENDER
1852#undef _BOOLITEM 1852#undef _BOOLITEM
1853 1853
1854 // finaly update menu 1854 // finaly update menu
1855 menu.update(); 1855 menu.updateMenu();
1856} 1856}
1857 1857
1858 1858
diff --git a/src/SendToMenu.cc b/src/SendToMenu.cc
index c071495..2bdf7e3 100644
--- a/src/SendToMenu.cc
+++ b/src/SendToMenu.cc
@@ -61,7 +61,7 @@ SendToMenu::SendToMenu(FluxboxWindow &win):
61 61
62 disableTitle(); 62 disableTitle();
63 // build menu 63 // build menu
64 update(0); 64 updateMenu(0);
65} 65}
66 66
67void SendToMenu::update(FbTk::Subject *subj) { 67void SendToMenu::update(FbTk::Subject *subj) {
@@ -75,7 +75,7 @@ void SendToMenu::update(FbTk::Subject *subj) {
75 setItemEnabled(i, true); 75 setItemEnabled(i, true);
76 // disable send to on the workspace which the window exist 76 // disable send to on the workspace which the window exist
77 setItemEnabled(m_win.workspaceNumber(), false); 77 setItemEnabled(m_win.workspaceNumber(), false);
78 FbMenu::update(); 78 updateMenu();
79 // we're done 79 // we're done
80 return; 80 return;
81 } else if (subj == &(theme().reconfigSig())) { 81 } else if (subj == &(theme().reconfigSig())) {
@@ -98,5 +98,5 @@ void SendToMenu::update(FbTk::Subject *subj) {
98 98
99 setItemEnabled(m_win.workspaceNumber(), false); 99 setItemEnabled(m_win.workspaceNumber(), false);
100 100
101 FbMenu::update(); 101 updateMenu();
102} 102}
diff --git a/src/Slit.cc b/src/Slit.cc
index b89e428..566b76d 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -1174,7 +1174,7 @@ void Slit::updateClientmenu() {
1174 "Save SlitList", "Saves the current order in the slit"), 1174 "Save SlitList", "Saves the current order in the slit"),
1175 savecmd); 1175 savecmd);
1176 1176
1177 m_clientlist_menu.update(); 1177 m_clientlist_menu.updateMenu();
1178} 1178}
1179 1179
1180void Slit::saveClientList() { 1180void Slit::saveClientList() {
@@ -1271,7 +1271,7 @@ void Slit::setupMenu() {
1271 *this, 1271 *this,
1272 save_and_reconfigure)); 1272 save_and_reconfigure));
1273 m_slitmenu.insert(_FBTEXT(Slit, ClientsMenu, "Clients", "Slit client menu"), &m_clientlist_menu); 1273 m_slitmenu.insert(_FBTEXT(Slit, ClientsMenu, "Clients", "Slit client menu"), &m_clientlist_menu);
1274 m_slitmenu.update(); 1274 m_slitmenu.updateMenu();
1275 1275
1276 // setup sub menu 1276 // setup sub menu
1277 m_placement_menu.setLabel(_FBTEXT(Slit, Placement, "Slit Placement", "Slit Placement")); 1277 m_placement_menu.setLabel(_FBTEXT(Slit, Placement, "Slit Placement", "Slit Placement"));
@@ -1313,7 +1313,7 @@ void Slit::setupMenu() {
1313 } 1313 }
1314 1314
1315 // finaly update sub menu 1315 // finaly update sub menu
1316 m_placement_menu.update(); 1316 m_placement_menu.updateMenu();
1317} 1317}
1318 1318
1319void Slit::moveToLayer(int layernum) { 1319void Slit::moveToLayer(int layernum) {
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index a5ddd12..b2566b3 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -882,7 +882,7 @@ void Toolbar::setupMenus() {
882 place_menu.pop_front(); 882 place_menu.pop_front();
883 } 883 }
884 menu().insert(_FBTEXT(Menu, Placement, "Placement", "Title of Placement menu"), &placementMenu()); 884 menu().insert(_FBTEXT(Menu, Placement, "Placement", "Title of Placement menu"), &placementMenu());
885 placementMenu().update(); 885 placementMenu().updateMenu();
886 886
887 887
888 // this saves resources and clears the slit window to update alpha value 888 // this saves resources and clears the slit window to update alpha value
@@ -899,7 +899,7 @@ void Toolbar::setupMenus() {
899 alpha_menuitem->setCommand(set_alpha_cmd); 899 alpha_menuitem->setCommand(set_alpha_cmd);
900 900
901 menu().insert(alpha_menuitem); 901 menu().insert(alpha_menuitem);
902 menu().update(); 902 menu().updateMenu();
903} 903}
904 904
905void Toolbar::saveOnHead(int head) { 905void Toolbar::saveOnHead(int head) {
diff --git a/src/Workspace.cc b/src/Workspace.cc
index 4de6a37..e0bf51d 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -353,7 +353,7 @@ bool Workspace::loadGroups(const std::string &filename) {
353} 353}
354 354
355void Workspace::update(FbTk::Subject *subj) { 355void Workspace::update(FbTk::Subject *subj) {
356 menu().update(); 356 menu().updateMenu();
357} 357}
358 358
359 359
@@ -373,7 +373,7 @@ void Workspace::setName(const std::string &name) {
373 screen().updateWorkspaceNamesAtom(); 373 screen().updateWorkspaceNamesAtom();
374 374
375 menu().setLabel(m_name.c_str()); 375 menu().setLabel(m_name.c_str());
376 menu().update(); 376 menu().updateMenu();
377} 377}
378 378
379/** 379/**
@@ -407,7 +407,7 @@ void Workspace::updateClientmenu() {
407 menu().insert(new ClientMenuItem(*(*client_it))); 407 menu().insert(new ClientMenuItem(*(*client_it)));
408 } 408 }
409 409
410 menu().update(); 410 menu().updateMenu();
411} 411}
412 412
413void Workspace::placeWindow(FluxboxWindow &win) { 413void Workspace::placeWindow(FluxboxWindow &win) {
diff --git a/src/WorkspaceMenu.cc b/src/WorkspaceMenu.cc
index 6403319..31b80a3 100644
--- a/src/WorkspaceMenu.cc
+++ b/src/WorkspaceMenu.cc
@@ -61,12 +61,12 @@ void WorkspaceMenu::update(FbTk::Subject *subj) {
61 item = find(i); 61 item = find(i);
62 if (item && item->isSelected()) { 62 if (item && item->isSelected()) {
63 setItemSelected(i, false); 63 setItemSelected(i, false);
64 FbTk::Menu::update(i); 64 updateMenu(i);
65 break; 65 break;
66 } 66 }
67 } 67 }
68 setItemSelected(screen.currentWorkspace()->workspaceID() + 2, true); 68 setItemSelected(screen.currentWorkspace()->workspaceID() + 2, true);
69 FbTk::Menu::update(screen.currentWorkspace()->workspaceID() + 2); 69 updateMenu(screen.currentWorkspace()->workspaceID() + 2);
70 } else if (subj == &screen.workspaceCountSig() || 70 } else if (subj == &screen.workspaceCountSig() ||
71 subj == &screen.workspaceNamesSig()) { 71 subj == &screen.workspaceNamesSig()) {
72 while (numberOfItems() > 2) { 72 while (numberOfItems() > 2) {
@@ -88,7 +88,7 @@ void WorkspaceMenu::update(FbTk::Subject *subj) {
88 insert(_FBTEXT(Menu, Icons, "Icons", "Iconic windows menu title"), 88 insert(_FBTEXT(Menu, Icons, "Icons", "Iconic windows menu title"),
89 MenuCreator::createMenuType("iconmenu", screen.screenNumber())); 89 MenuCreator::createMenuType("iconmenu", screen.screenNumber()));
90 90
91 FbTk::Menu::update(-1); 91 updateMenu(-1);
92 } 92 }
93 } else { 93 } else {
94 FbTk::Menu::update(subj); 94 FbTk::Menu::update(subj);
@@ -126,5 +126,5 @@ void WorkspaceMenu::init(BScreen &screen) {
126 126
127 insert(_FBTEXT(Menu, Icons, "Icons", "Iconic windows menu title"), 127 insert(_FBTEXT(Menu, Icons, "Icons", "Iconic windows menu title"),
128 MenuCreator::createMenuType("iconmenu", screen.screenNumber())); 128 MenuCreator::createMenuType("iconmenu", screen.screenNumber()));
129 FbMenu::update(); 129 updateMenu();
130} 130}
diff --git a/src/Xinerama.hh b/src/Xinerama.hh
index 545555d..6c2b521 100644
--- a/src/Xinerama.hh
+++ b/src/Xinerama.hh
@@ -99,7 +99,7 @@ XineramaHeadMenu<ItemType>::XineramaHeadMenu(MenuTheme &tm, BScreen &screen, FbT
99 // TODO: nls 99 // TODO: nls
100 insert(new XineramaHeadMenuItem<ItemType>( 100 insert(new XineramaHeadMenuItem<ItemType>(
101 "All Heads", m_object, 0, saverc_cmd)); 101 "All Heads", m_object, 0, saverc_cmd));
102 update(); 102 updateMenu();
103} 103}
104 104
105#endif // XINERAMA_HH 105#endif // XINERAMA_HH