diff options
author | fluxgen <fluxgen> | 2003-02-16 00:08:29 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-02-16 00:08:29 (GMT) |
commit | df5ba6f28030e7be7a567313ee04b6d71ca2df9b (patch) | |
tree | d9b9240b7cef31721b3525c6d423a44b4f9674e9 | |
parent | 084792e6ecdf9e3191bf55b727928e03ea938b22 (diff) | |
download | fluxbox-df5ba6f28030e7be7a567313ee04b6d71ca2df9b.zip fluxbox-df5ba6f28030e7be7a567313ee04b6d71ca2df9b.tar.bz2 |
using reference for screen
-rw-r--r-- | src/Toolbar.hh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Toolbar.hh b/src/Toolbar.hh index eb7af70..cfebedd 100644 --- a/src/Toolbar.hh +++ b/src/Toolbar.hh | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Toolbar.hh,v 1.22 2003/02/15 02:00:29 fluxgen Exp $ | 25 | // $Id: Toolbar.hh,v 1.23 2003/02/16 00:08:29 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef TOOLBAR_HH | 27 | #ifndef TOOLBAR_HH |
28 | #define TOOLBAR_HH | 28 | #define TOOLBAR_HH |
@@ -61,7 +61,7 @@ public: | |||
61 | }; | 61 | }; |
62 | 62 | ||
63 | /// create a toolbar on the screen with specific width | 63 | /// create a toolbar on the screen with specific width |
64 | explicit Toolbar(BScreen *screen, size_t width = 200); | 64 | explicit Toolbar(BScreen &screen, size_t width = 200); |
65 | /// destructor | 65 | /// destructor |
66 | virtual ~Toolbar(); | 66 | virtual ~Toolbar(); |
67 | 67 | ||
@@ -83,8 +83,8 @@ public: | |||
83 | inline bool doAutoHide() const { return do_auto_hide; } | 83 | inline bool doAutoHide() const { return do_auto_hide; } |
84 | /// @return X window of the toolbar | 84 | /// @return X window of the toolbar |
85 | inline Window getWindowID() const { return frame.window.window(); } | 85 | inline Window getWindowID() const { return frame.window.window(); } |
86 | inline BScreen *screen() { return m_screen; } | 86 | inline BScreen &screen() { return m_screen; } |
87 | inline const BScreen *screen() const { return m_screen; } | 87 | inline const BScreen &screen() const { return m_screen; } |
88 | inline unsigned int width() const { return frame.width; } | 88 | inline unsigned int width() const { return frame.width; } |
89 | inline unsigned int height() const { return frame.height; } | 89 | inline unsigned int height() const { return frame.height; } |
90 | inline unsigned int exposedHeight() const { return ((do_auto_hide) ? frame.bevel_w : frame.height); } | 90 | inline unsigned int exposedHeight() const { return ((do_auto_hide) ? frame.bevel_w : frame.height); } |
@@ -147,7 +147,7 @@ private: | |||
147 | } hide_handler; | 147 | } hide_handler; |
148 | friend class HideHandler; | 148 | friend class HideHandler; |
149 | 149 | ||
150 | BScreen *m_screen; | 150 | BScreen &m_screen; |
151 | FbTk::ImageControl &image_ctrl; | 151 | FbTk::ImageControl &image_ctrl; |
152 | FbTk::Timer clock_timer; ///< timer to update clock | 152 | FbTk::Timer clock_timer; ///< timer to update clock |
153 | FbTk::Timer hide_timer; ///< timer to for auto hide toolbar | 153 | FbTk::Timer hide_timer; ///< timer to for auto hide toolbar |