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/Screen.hh | |
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/Screen.hh')
-rw-r--r-- | src/Screen.hh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/Screen.hh b/src/Screen.hh index 729461a..4d1d933 100644 --- a/src/Screen.hh +++ b/src/Screen.hh | |||
@@ -75,7 +75,6 @@ class Menu; | |||
75 | class ImageControl; | 75 | class ImageControl; |
76 | class LayerItem; | 76 | class LayerItem; |
77 | class FbWindow; | 77 | class FbWindow; |
78 | class Subject; | ||
79 | } | 78 | } |
80 | 79 | ||
81 | 80 | ||
@@ -83,8 +82,7 @@ class Subject; | |||
83 | /** | 82 | /** |
84 | Create workspaces, handles switching between workspaces and windows | 83 | Create workspaces, handles switching between workspaces and windows |
85 | */ | 84 | */ |
86 | class BScreen: public FbTk::EventHandler, public FbTk::Observer, | 85 | class BScreen: public FbTk::EventHandler, private FbTk::NotCopyable { |
87 | private FbTk::NotCopyable { | ||
88 | public: | 86 | public: |
89 | typedef std::list<FluxboxWindow *> Icons; | 87 | typedef std::list<FluxboxWindow *> Icons; |
90 | 88 | ||
@@ -220,9 +218,6 @@ public: | |||
220 | ScreenSignal &bgChangeSig() { return m_bg_change_sig; } | 218 | ScreenSignal &bgChangeSig() { return m_bg_change_sig; } |
221 | //@} | 219 | //@} |
222 | 220 | ||
223 | /// called when the screen receives a signal from a subject | ||
224 | void update(FbTk::Subject *subj); | ||
225 | |||
226 | void propertyNotify(Atom atom); | 221 | void propertyNotify(Atom atom); |
227 | void keyPressEvent(XKeyEvent &ke); | 222 | void keyPressEvent(XKeyEvent &ke); |
228 | void keyReleaseEvent(XKeyEvent &ke); | 223 | void keyReleaseEvent(XKeyEvent &ke); |
@@ -476,9 +471,11 @@ private: | |||
476 | void setupConfigmenu(FbTk::Menu &menu); | 471 | void setupConfigmenu(FbTk::Menu &menu); |
477 | void renderGeomWindow(); | 472 | void renderGeomWindow(); |
478 | void renderPosWindow(); | 473 | void renderPosWindow(); |
474 | void focusedWinFrameThemeReconfigured(); | ||
479 | 475 | ||
480 | const Strut* availableWorkspaceArea(int head) const; | 476 | const Strut* availableWorkspaceArea(int head) const; |
481 | 477 | ||
478 | FbTk::SignalTracker m_tracker; | ||
482 | ScreenSubject m_reconfigure_sig; ///< reconfigure signal | 479 | ScreenSubject m_reconfigure_sig; ///< reconfigure signal |
483 | 480 | ||
484 | 481 | ||