diff options
Diffstat (limited to 'src/ToolbarHandler.hh')
-rw-r--r-- | src/ToolbarHandler.hh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/ToolbarHandler.hh b/src/ToolbarHandler.hh index 599fd67..02d131d 100644 --- a/src/ToolbarHandler.hh +++ b/src/ToolbarHandler.hh | |||
@@ -20,7 +20,7 @@ | |||
20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 | // DEALINGS IN THE SOFTWARE. | 21 | // DEALINGS IN THE SOFTWARE. |
22 | 22 | ||
23 | // $Id: ToolbarHandler.hh,v 1.7 2003/07/28 15:06:34 rathnor Exp $ | 23 | // $Id: ToolbarHandler.hh,v 1.8 2003/09/08 18:18:25 fluxgen Exp $ |
24 | 24 | ||
25 | #ifndef TOOLBARHANDLER_HH | 25 | #ifndef TOOLBARHANDLER_HH |
26 | #define TOOLBARHANDLER_HH | 26 | #define TOOLBARHANDLER_HH |
@@ -49,7 +49,6 @@ public: | |||
49 | ~ToolbarHandler() { } | 49 | ~ToolbarHandler() { } |
50 | 50 | ||
51 | void setMode(ToolbarMode mode, bool initialise = true); | 51 | void setMode(ToolbarMode mode, bool initialise = true); |
52 | ToolbarMode mode() const { return *m_rc_mode; }; | ||
53 | 52 | ||
54 | inline const Toolbar *toolbar() const { return m_toolbar.get(); } | 53 | inline const Toolbar *toolbar() const { return m_toolbar.get(); } |
55 | inline Toolbar *toolbar() { return m_toolbar.get(); } | 54 | inline Toolbar *toolbar() { return m_toolbar.get(); } |
@@ -85,13 +84,12 @@ public: | |||
85 | 84 | ||
86 | inline BScreen &screen() { return m_screen; } | 85 | inline BScreen &screen() { return m_screen; } |
87 | inline const BScreen &screen() const { return m_screen; } | 86 | inline const BScreen &screen() const { return m_screen; } |
88 | 87 | ToolbarMode mode() const { return m_mode; } | |
89 | private: | 88 | private: |
90 | BScreen &m_screen; | 89 | BScreen &m_screen; |
91 | FbTk::Resource<ToolbarMode> m_rc_mode; | ||
92 | std::auto_ptr<Toolbar> m_toolbar; | 90 | std::auto_ptr<Toolbar> m_toolbar; |
93 | unsigned int m_current_workspace; | 91 | unsigned int m_current_workspace; |
94 | 92 | ToolbarMode m_mode; | |
95 | FbTk::Menu m_modemenu; | 93 | FbTk::Menu m_modemenu; |
96 | FbTk::Menu m_toolbarmenu; | 94 | FbTk::Menu m_toolbarmenu; |
97 | }; | 95 | }; |