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