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/GenericTool.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/GenericTool.hh')
-rw-r--r-- | src/GenericTool.hh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/GenericTool.hh b/src/GenericTool.hh index 5d7c8d4..72ff462 100644 --- a/src/GenericTool.hh +++ b/src/GenericTool.hh | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "ToolbarItem.hh" | 25 | #include "ToolbarItem.hh" |
26 | 26 | ||
27 | #include "FbTk/NotCopyable.hh" | 27 | #include "FbTk/NotCopyable.hh" |
28 | #include "FbTk/Observer.hh" | 28 | #include "FbTk/Signal.hh" |
29 | 29 | ||
30 | #include <memory> | 30 | #include <memory> |
31 | 31 | ||
@@ -37,7 +37,7 @@ template <class T> class ThemeProxy; | |||
37 | } | 37 | } |
38 | 38 | ||
39 | /// helper class for simple tools, i.e buttons etc | 39 | /// helper class for simple tools, i.e buttons etc |
40 | class GenericTool: public ToolbarItem, public FbTk::Observer, private FbTk::NotCopyable { | 40 | class GenericTool: public ToolbarItem, private FbTk::NotCopyable { |
41 | public: | 41 | public: |
42 | GenericTool(FbTk::FbWindow *new_window, ToolbarItem::Type type, | 42 | GenericTool(FbTk::FbWindow *new_window, ToolbarItem::Type type, |
43 | FbTk::ThemeProxy<ToolTheme> &theme); | 43 | FbTk::ThemeProxy<ToolTheme> &theme); |
@@ -63,10 +63,11 @@ protected: | |||
63 | virtual void renderTheme(int alpha); | 63 | virtual void renderTheme(int alpha); |
64 | 64 | ||
65 | private: | 65 | private: |
66 | void update(FbTk::Subject *subj); | 66 | void themeReconfigured(); |
67 | 67 | ||
68 | std::auto_ptr<FbTk::FbWindow> m_window; | 68 | std::auto_ptr<FbTk::FbWindow> m_window; |
69 | FbTk::ThemeProxy<ToolTheme> &m_theme; | 69 | FbTk::ThemeProxy<ToolTheme> &m_theme; |
70 | FbTk::SignalTracker m_tracker; | ||
70 | }; | 71 | }; |
71 | 72 | ||
72 | #endif // GENERICTOOL_HH | 73 | #endif // GENERICTOOL_HH |