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/Slit.cc | |
parent | 54230c9a4474baf4f1c56773992212093e222349 (diff) | |
download | fluxbox-f7d7dfd2a8047207dbe90bc77592c25acf4ca15c.zip fluxbox-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/Slit.cc')
-rw-r--r-- | src/Slit.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/Slit.cc b/src/Slit.cc index ef1564a..f3e24a9 100644 --- a/src/Slit.cc +++ b/src/Slit.cc | |||
@@ -263,13 +263,13 @@ Slit::Slit(BScreen &scr, FbTk::Layer &layer, const char *filename) | |||
263 | _FB_USES_NLS; | 263 | _FB_USES_NLS; |
264 | 264 | ||
265 | // attach to theme and root window change signal | 265 | // attach to theme and root window change signal |
266 | theme().reconfigSig().attach(this); | 266 | join(theme().reconfigSig(), FbTk::MemFun(*this, &Slit::reconfigure)); |
267 | 267 | ||
268 | join(scr.resizeSig(), | 268 | join(scr.resizeSig(), |
269 | FbTk::MemFun(*this, &Slit::screenSizeChanged)); | 269 | FbTk::MemFun(*this, &Slit::screenSizeChanged)); |
270 | 270 | ||
271 | join(scr.bgChangeSig(), | 271 | join(scr.bgChangeSig(), |
272 | FbTk::MemFun(*this, &Slit::updateForScreen)); | 272 | FbTk::MemFunIgnoreArgs(*this, &Slit::reconfigure)); |
273 | 273 | ||
274 | scr.reconfigureSig().attach(this); // if alpha changed (we disablethis signal when we get theme change sig) | 274 | scr.reconfigureSig().attach(this); // if alpha changed (we disablethis signal when we get theme change sig) |
275 | 275 | ||
@@ -1042,12 +1042,8 @@ void Slit::screenSizeChanged(BScreen &screen) { | |||
1042 | #endif // XINERAMA | 1042 | #endif // XINERAMA |
1043 | } | 1043 | } |
1044 | 1044 | ||
1045 | void Slit::updateForScreen(BScreen &screen) { | ||
1046 | reconfigure(); | ||
1047 | } | ||
1048 | |||
1049 | void Slit::update(FbTk::Subject*) { | 1045 | void Slit::update(FbTk::Subject*) { |
1050 | updateForScreen(screen()); | 1046 | reconfigure(); |
1051 | } | 1047 | } |
1052 | 1048 | ||
1053 | void Slit::clearWindow() { | 1049 | void Slit::clearWindow() { |