aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Menu.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/FbTk/Menu.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/FbTk/Menu.hh')
-rw-r--r--src/FbTk/Menu.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 04b440c..423b80a 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -117,7 +117,7 @@ public:
117 void setLabel(const char *labelstr); 117 void setLabel(const char *labelstr);
118 /// move menu to x,y 118 /// move menu to x,y
119 void move(int x, int y); 119 void move(int x, int y);
120 virtual void update(int active_index = -1); 120 virtual void updateMenu(int active_index = -1);
121 void setItemSelected(unsigned int index, bool val); 121 void setItemSelected(unsigned int index, bool val);
122 void setItemEnabled(unsigned int index, bool val); 122 void setItemEnabled(unsigned int index, bool val);
123 inline void setMinimumSublevels(int m) { menu.minsub = m; } 123 inline void setMinimumSublevels(int m) { menu.minsub = m; }