aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
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/Screen.cc
parent7c7dfbfbddc635faaabb87fa755925fbb66d89dd (diff)
downloadfluxbox_pavel-eb42a7806d0af854cc4bdfa8f194a0bb67446153.zip
fluxbox_pavel-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/Screen.cc')
-rw-r--r--src/Screen.cc8
1 files changed, 4 insertions, 4 deletions
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