summaryrefslogtreecommitdiff
path: root/src/Window.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/Window.cc
parent1f01d84c080d607a91eb417efcaf5e500b5f1d7e (diff)
downloadfluxbox_lack-9f2f65a698c4cc71373a7fe9d73a0889e0d3487b.zip
fluxbox_lack-9f2f65a698c4cc71373a7fe9d73a0889e0d3487b.tar.bz2
make FbTk::Command a template class, split parsing information out of ObjectRegistry
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Window.cc b/src/Window.cc
index da0a9fa..3e1ad4e 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -221,7 +221,7 @@ void tempRaiseFluxboxWindow(FluxboxWindow &win) {
221 221
222} 222}
223 223
224class SetClientCmd:public FbTk::Command { 224class SetClientCmd:public FbTk::Command<void> {
225public: 225public:
226 explicit SetClientCmd(WinClient &client):m_client(client) { 226 explicit SetClientCmd(WinClient &client):m_client(client) {
227 } 227 }
@@ -446,7 +446,7 @@ void FluxboxWindow::init() {
446 m_client->x = wattrib.x; m_client->y = wattrib.y; 446 m_client->x = wattrib.x; m_client->y = wattrib.y;
447 447
448 m_timer.setTimeout(fluxbox.getAutoRaiseDelay()); 448 m_timer.setTimeout(fluxbox.getAutoRaiseDelay());
449 FbTk::RefCount<FbTk::Command> raise_cmd(new FbTk::SimpleCommand<FluxboxWindow>(*this, 449 FbTk::RefCount<FbTk::Command<void> > raise_cmd(new FbTk::SimpleCommand<FluxboxWindow>(*this,
450 &FluxboxWindow::raise)); 450 &FluxboxWindow::raise));
451 m_timer.setCommand(raise_cmd); 451 m_timer.setCommand(raise_cmd);
452 m_timer.fireOnce(true); 452 m_timer.fireOnce(true);
@@ -3971,7 +3971,7 @@ void FluxboxWindow::updateButtons() {
3971 frame().removeAllButtons(); 3971 frame().removeAllButtons();
3972 3972
3973 using namespace FbTk; 3973 using namespace FbTk;
3974 typedef RefCount<Command> CommandRef; 3974 typedef RefCount<Command<void> > CommandRef;
3975 typedef SimpleCommand<FluxboxWindow> WindowCmd; 3975 typedef SimpleCommand<FluxboxWindow> WindowCmd;
3976 3976
3977 CommandRef iconify_cmd(new WindowCmd(*this, &FluxboxWindow::iconify)); 3977 CommandRef iconify_cmd(new WindowCmd(*this, &FluxboxWindow::iconify));
@@ -4142,7 +4142,7 @@ void FluxboxWindow::associateClient(WinClient &client) {
4142 frame().theme().unfocusedTheme()->iconbarTheme(), client); 4142 frame().theme().unfocusedTheme()->iconbarTheme(), client);
4143 frame().createTab(*btn); 4143 frame().createTab(*btn);
4144 4144
4145 FbTk::RefCount<FbTk::Command> setcmd(new SetClientCmd(client)); 4145 FbTk::RefCount<FbTk::Command<void> > setcmd(new SetClientCmd(client));
4146 btn->setOnClick(setcmd, 1); 4146 btn->setOnClick(setcmd, 1);
4147 btn->setTextPadding(Fluxbox::instance()->getTabsPadding()); 4147 btn->setTextPadding(Fluxbox::instance()->getTabsPadding());
4148 btn->setPixmap(screen().getTabsUsePixmap()); 4148 btn->setPixmap(screen().getTabsUsePixmap());