diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-04-29 08:52:28 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2011-05-10 11:00:45 (GMT) |
commit | f7d7dfd2a8047207dbe90bc77592c25acf4ca15c (patch) | |
tree | 46eb8596d15fb0450f07e3e5d58e2c5449c4c020 /src/FbTk/Menu.cc | |
parent | 54230c9a4474baf4f1c56773992212093e222349 (diff) | |
download | fluxbox_pavel-f7d7dfd2a8047207dbe90bc77592c25acf4ca15c.zip fluxbox_pavel-f7d7dfd2a8047207dbe90bc77592c25acf4ca15c.tar.bz2 |
Convert FbTk::Theme::reconfigSig and friends to the new Signal system
I removed the const versions of reconfigSig() in the process since FbTk::Signal has no const
methods anyway.
Diffstat (limited to 'src/FbTk/Menu.cc')
-rw-r--r-- | src/FbTk/Menu.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc index 48636ce..da5760d 100644 --- a/src/FbTk/Menu.cc +++ b/src/FbTk/Menu.cc | |||
@@ -36,6 +36,7 @@ | |||
36 | #include "MenuItem.hh" | 36 | #include "MenuItem.hh" |
37 | #include "MenuSeparator.hh" | 37 | #include "MenuSeparator.hh" |
38 | #include "ImageControl.hh" | 38 | #include "ImageControl.hh" |
39 | #include "MemFun.hh" | ||
39 | #include "MenuTheme.hh" | 40 | #include "MenuTheme.hh" |
40 | #include "App.hh" | 41 | #include "App.hh" |
41 | #include "EventManager.hh" | 42 | #include "EventManager.hh" |
@@ -121,7 +122,7 @@ Menu::Menu(FbTk::ThemeProxy<MenuTheme> &tm, ImageControl &imgctrl): | |||
121 | m_hide_timer.fireOnce(true); | 122 | m_hide_timer.fireOnce(true); |
122 | 123 | ||
123 | // make sure we get updated when the theme is reloaded | 124 | // make sure we get updated when the theme is reloaded |
124 | tm.reconfigSig().attach(this); | 125 | m_tracker.join(tm.reconfigSig(), MemFun(*this, &Menu::themeReconfigured)); |
125 | 126 | ||
126 | m_title_vis = true; | 127 | m_title_vis = true; |
127 | 128 | ||
@@ -1244,7 +1245,6 @@ void Menu::update(FbTk::Subject *subj) { | |||
1244 | reconfigure(); | 1245 | reconfigure(); |
1245 | } | 1246 | } |
1246 | 1247 | ||
1247 | |||
1248 | void Menu::setScreen(int x, int y, int w, int h) { | 1248 | void Menu::setScreen(int x, int y, int w, int h) { |
1249 | m_screen_x = x; | 1249 | m_screen_x = x; |
1250 | m_screen_y = y; | 1250 | m_screen_y = y; |