aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.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/Toolbar.cc
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/Toolbar.cc')
-rw-r--r--src/Toolbar.cc4
1 files changed, 2 insertions, 2 deletions
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) {