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/WorkspaceNameTool.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/WorkspaceNameTool.hh')
-rw-r--r-- | src/WorkspaceNameTool.hh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/WorkspaceNameTool.hh b/src/WorkspaceNameTool.hh index de95663..195dc1f 100644 --- a/src/WorkspaceNameTool.hh +++ b/src/WorkspaceNameTool.hh | |||
@@ -26,7 +26,6 @@ | |||
26 | #include "ToolbarItem.hh" | 26 | #include "ToolbarItem.hh" |
27 | 27 | ||
28 | #include "FbTk/TextButton.hh" | 28 | #include "FbTk/TextButton.hh" |
29 | #include "FbTk/Observer.hh" | ||
30 | #include "FbTk/Signal.hh" | 29 | #include "FbTk/Signal.hh" |
31 | 30 | ||
32 | class BScreen; | 31 | class BScreen; |
@@ -36,8 +35,7 @@ namespace FbTk { | |||
36 | template <class T> class ThemeProxy; | 35 | template <class T> class ThemeProxy; |
37 | } | 36 | } |
38 | 37 | ||
39 | class WorkspaceNameTool: public ToolbarItem, public FbTk::Observer, | 38 | class WorkspaceNameTool: public ToolbarItem, private FbTk::SignalTracker { |
40 | private FbTk::SignalTracker { | ||
41 | public: | 39 | public: |
42 | WorkspaceNameTool(const FbTk::FbWindow &parent, FbTk::ThemeProxy<ToolTheme> &theme, BScreen &screen); | 40 | WorkspaceNameTool(const FbTk::FbWindow &parent, FbTk::ThemeProxy<ToolTheme> &theme, BScreen &screen); |
43 | virtual ~WorkspaceNameTool(); | 41 | virtual ~WorkspaceNameTool(); |
@@ -53,7 +51,6 @@ public: | |||
53 | unsigned int height() const; | 51 | unsigned int height() const; |
54 | unsigned int borderWidth() const; | 52 | unsigned int borderWidth() const; |
55 | 53 | ||
56 | void update(FbTk::Subject *subj); | ||
57 | FbTk::Button &button() { return m_button; } | 54 | FbTk::Button &button() { return m_button; } |
58 | const FbTk::Button &button() const { return m_button; } | 55 | const FbTk::Button &button() const { return m_button; } |
59 | void setOrientation(FbTk::Orientation orient); | 56 | void setOrientation(FbTk::Orientation orient); |
@@ -61,8 +58,7 @@ public: | |||
61 | void parentMoved() { m_button.parentMoved(); } | 58 | void parentMoved() { m_button.parentMoved(); } |
62 | 59 | ||
63 | private: | 60 | private: |
64 | /// Called when workspace changed on \c screen | 61 | void update(); |
65 | void updateForScreen(BScreen &screen); | ||
66 | 62 | ||
67 | void renderTheme(int alpha); | 63 | void renderTheme(int alpha); |
68 | void reRender(); | 64 | void reRender(); |