aboutsummaryrefslogtreecommitdiff
path: root/src/FbMenu.hh
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/FbMenu.hh
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/FbMenu.hh')
-rw-r--r--src/FbMenu.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/FbMenu.hh b/src/FbMenu.hh
index ec1b401..66cb462 100644
--- a/src/FbMenu.hh
+++ b/src/FbMenu.hh
@@ -36,7 +36,7 @@ public:
36 FbMenu(MenuTheme &tm, FbTk::ImageControl &imgctrl, 36 FbMenu(MenuTheme &tm, FbTk::ImageControl &imgctrl,
37 FbTk::XLayer &layer); 37 FbTk::XLayer &layer);
38 virtual ~FbMenu(); 38 virtual ~FbMenu();
39 void update(int index = -1); 39 void updateMenu(int index = -1);
40 void clearWindow(); 40 void clearWindow();
41 void raise() { m_layeritem.raise(); } 41 void raise() { m_layeritem.raise(); }
42 void lower() { m_layeritem.lower(); } 42 void lower() { m_layeritem.lower(); }