aboutsummaryrefslogtreecommitdiff
path: root/src/ClientMenu.cc
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-04-30 09:32:10 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-05-10 11:00:45 (GMT)
commitfa15400cc24ddcfd6e361bd068ae1986b9f9e561 (patch)
treece137e8ce4486e42451b3f4921ba519a13270469 /src/ClientMenu.cc
parentf7d7dfd2a8047207dbe90bc77592c25acf4ca15c (diff)
downloadfluxbox_pavel-fa15400cc24ddcfd6e361bd068ae1986b9f9e561.zip
fluxbox_pavel-fa15400cc24ddcfd6e361bd068ae1986b9f9e561.tar.bz2
Remove the Observer dependency from FbTk::Menu
Diffstat (limited to 'src/ClientMenu.cc')
-rw-r--r--src/ClientMenu.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/ClientMenu.cc b/src/ClientMenu.cc
index faa1d3f..4a3dacd 100644
--- a/src/ClientMenu.cc
+++ b/src/ClientMenu.cc
@@ -153,13 +153,11 @@ void ClientMenu::titleChanged(Focusable& win) {
153 // find correct menu item 153 // find correct menu item
154 ClientMenuItem* cl_item = getMenuItem(*this, win); 154 ClientMenuItem* cl_item = getMenuItem(*this, win);
155 if (cl_item) 155 if (cl_item)
156 FbTk::Menu::update(0); 156 themeReconfigured();
157} 157}
158 158
159void ClientMenu::update(FbTk::Subject *subj) { 159void ClientMenu::update(FbTk::Subject *subj) {
160 if (subj && typeid(*subj) == typeid(Focusable::FocusSubject)) { 160 if (Focusable::FocusSubject *fsubj = dynamic_cast<Focusable::FocusSubject *>(subj)) {
161
162 Focusable::FocusSubject *fsubj = static_cast<Focusable::FocusSubject *>(subj);
163 Focusable &win = fsubj->win(); 161 Focusable &win = fsubj->win();
164 162
165 // find correct menu item 163 // find correct menu item
@@ -169,6 +167,5 @@ void ClientMenu::update(FbTk::Subject *subj) {
169 if (cl_item && fsubj == &win.dieSig()) { 167 if (cl_item && fsubj == &win.dieSig()) {
170 remove(cl_item->getIndex()); 168 remove(cl_item->getIndex());
171 } 169 }
172 } else 170 }
173 FbTk::Menu::update(subj);
174} 171}