diff options
author | mathias <mathias> | 2004-12-13 14:03:17 (GMT) |
---|---|---|
committer | mathias <mathias> | 2004-12-13 14:03:17 (GMT) |
commit | eb42a7806d0af854cc4bdfa8f194a0bb67446153 (patch) | |
tree | 5a8a22b0705ee927a16265f1a754159835fb22d9 /src/WorkspaceMenu.cc | |
parent | 7c7dfbfbddc635faaabb87fa755925fbb66d89dd (diff) | |
download | fluxbox-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/WorkspaceMenu.cc')
-rw-r--r-- | src/WorkspaceMenu.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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 | } |