aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-01-09 22:10:53 (GMT)
committerfluxgen <fluxgen>2003-01-09 22:10:53 (GMT)
commit2e40e38c426a247ee062ad725a2b5b1762d4a46c (patch)
tree4da90c0b0d905db1148096830bac5148969dcb34 /src
parentec1dffac321d0a3369e5e26dd56b2e5fcc4d1a79 (diff)
downloadfluxbox-2e40e38c426a247ee062ad725a2b5b1762d4a46c.zip
fluxbox-2e40e38c426a247ee062ad725a2b5b1762d4a46c.tar.bz2
adjusted for FbTk Timer and ImageControl
Diffstat (limited to 'src')
-rw-r--r--src/Toolbar.hh15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index 069c8a1..b32aea1 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.18 2002/12/13 20:36:36 fluxgen Exp $ 25// $Id: Toolbar.hh,v 1.19 2003/01/09 22:10:53 fluxgen Exp $
26 26
27#ifndef TOOLBAR_HH 27#ifndef TOOLBAR_HH
28#define TOOLBAR_HH 28#define TOOLBAR_HH
@@ -39,6 +39,9 @@
39 39
40class Toolbar; 40class Toolbar;
41 41
42namespace FbTk {
43class ImageControl;
44};
42/** 45/**
43 Menu for toolbar. 46 Menu for toolbar.
44 @see Toolbar 47 @see Toolbar
@@ -96,7 +99,7 @@ private:
96/** 99/**
97 Handles iconbar, workspace name view and clock view 100 Handles iconbar, workspace name view and clock view
98 */ 101 */
99class Toolbar : public TimeoutHandler, public FbTk::EventHandler { 102class Toolbar : public FbTk::TimeoutHandler, public FbTk::EventHandler {
100public: 103public:
101 104
102 ///Toolbar placement on the screen 105 ///Toolbar placement on the screen
@@ -186,7 +189,7 @@ private:
186 button_w, bevel_w, label_h; 189 button_w, bevel_w, label_h;
187 } frame; 190 } frame;
188 191
189 class HideHandler : public TimeoutHandler { 192 class HideHandler : public FbTk::TimeoutHandler {
190 public: 193 public:
191 Toolbar *toolbar; 194 Toolbar *toolbar;
192 195
@@ -194,9 +197,9 @@ private:
194 } hide_handler; 197 } hide_handler;
195 198
196 BScreen *m_screen; 199 BScreen *m_screen;
197 BImageControl &image_ctrl; 200 FbTk::ImageControl &image_ctrl;
198 BTimer clock_timer; ///< timer to update clock 201 FbTk::Timer clock_timer; ///< timer to update clock
199 BTimer hide_timer; ///< timer to for auto hide toolbar 202 FbTk::Timer hide_timer; ///< timer to for auto hide toolbar
200 Toolbarmenu m_toolbarmenu; 203 Toolbarmenu m_toolbarmenu;
201 std::auto_ptr<IconBar> m_iconbar; 204 std::auto_ptr<IconBar> m_iconbar;
202 205