aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Menu.hh
diff options
context:
space:
mode:
authorHenrik Kinnunen <fluxgen@fluxbox.org>2008-09-28 08:53:16 (GMT)
committerHenrik Kinnunen <fluxgen@fluxbox.org>2008-09-28 08:53:16 (GMT)
commitf2c8868724ebcaa6afaac4a71093f77b7eeaa23f (patch)
treee64111d54d58f819e261f4fa552fae8e111b30e8 /src/FbTk/Menu.hh
parentbcf37890b617730cfded161b9a3d18f7c377e724 (diff)
parent04a1d2a83b96eb6d1b1958e4f3e25ffdf295aa4d (diff)
downloadfluxbox-f2c8868724ebcaa6afaac4a71093f77b7eeaa23f.zip
fluxbox-f2c8868724ebcaa6afaac4a71093f77b7eeaa23f.tar.bz2
Merge branch 'master' of fluxbox@git.fluxbox.org:fluxbox
Conflicts: ChangeLog
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 ee57a23..519a78b 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -109,7 +109,7 @@ public:
109 void setLabel(const FbString &labelstr); 109 void setLabel(const FbString &labelstr);
110 /// move menu to x,y 110 /// move menu to x,y
111 virtual void move(int x, int y); 111 virtual void move(int x, int y);
112 virtual void updateMenu(int active_index = -1); 112 virtual void updateMenu();
113 void setItemSelected(unsigned int index, bool val); 113 void setItemSelected(unsigned int index, bool val);
114 void setItemEnabled(unsigned int index, bool val); 114 void setItemEnabled(unsigned int index, bool val);
115 void setMinimumSublevels(int m) { menu.minsub = m; } 115 void setMinimumSublevels(int m) { menu.minsub = m; }