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