aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Menu.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-01-11 07:41:22 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-01-11 07:41:22 (GMT)
commit9f2f65a698c4cc71373a7fe9d73a0889e0d3487b (patch)
tree4ad67db771d73ea3c48f80a1244037fc9754edd2 /src/FbTk/Menu.cc
parent1f01d84c080d607a91eb417efcaf5e500b5f1d7e (diff)
downloadfluxbox-9f2f65a698c4cc71373a7fe9d73a0889e0d3487b.zip
fluxbox-9f2f65a698c4cc71373a7fe9d73a0889e0d3487b.tar.bz2
make FbTk::Command a template class, split parsing information out of ObjectRegistry
Diffstat (limited to 'src/FbTk/Menu.cc')
-rw-r--r--src/FbTk/Menu.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 51fca9d..696d847 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -95,12 +95,12 @@ Menu::Menu(FbTk::ThemeProxy<MenuTheme> &tm, ImageControl &imgctrl):
95 m_need_update(true) { 95 m_need_update(true) {
96 // setup timers 96 // setup timers
97 97
98 RefCount<Command> show_cmd(new SimpleCommand<Menu>(*this, &Menu::openSubmenu)); 98 RefCount<Command<void> > show_cmd(new SimpleCommand<Menu>(*this, &Menu::openSubmenu));
99 m_submenu_timer.setCommand(show_cmd); 99 m_submenu_timer.setCommand(show_cmd);
100 m_submenu_timer.fireOnce(true); 100 m_submenu_timer.fireOnce(true);
101 101
102 102
103 RefCount<Command> hide_cmd(new SimpleCommand<Menu>(*this, &Menu::closeMenu)); 103 RefCount<Command<void> > hide_cmd(new SimpleCommand<Menu>(*this, &Menu::closeMenu));
104 m_hide_timer.setCommand(hide_cmd); 104 m_hide_timer.setCommand(hide_cmd);
105 m_hide_timer.fireOnce(true); 105 m_hide_timer.fireOnce(true);
106 106
@@ -198,7 +198,7 @@ Menu::~Menu() {
198 s_focused = 0; 198 s_focused = 0;
199} 199}
200 200
201int Menu::insert(const FbString &label, RefCount<Command> &cmd, int pos) { 201int Menu::insert(const FbString &label, RefCount<Command<void> > &cmd, int pos) {
202 return insert(new MenuItem(label, cmd, this), pos); 202 return insert(new MenuItem(label, cmd, this), pos);
203} 203}
204 204