diff options
Diffstat (limited to 'src/Toolbar.hh')
-rw-r--r-- | src/Toolbar.hh | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/Toolbar.hh b/src/Toolbar.hh index d6e19db..adbe7e3 100644 --- a/src/Toolbar.hh +++ b/src/Toolbar.hh | |||
@@ -19,18 +19,21 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | #ifndef _TOOLBAR_HH_ | 22 | // $Id: Toolbar.hh,v 1.7 2002/02/17 18:49:02 fluxgen Exp $ |
23 | #define _TOOLBAR_HH_ | ||
24 | |||
25 | #include <X11/Xlib.h> | ||
26 | |||
27 | |||
28 | 23 | ||
24 | #ifndef TOOLBAR_HH | ||
25 | #define TOOLBAR_HH | ||
29 | 26 | ||
27 | #include <X11/Xlib.h> | ||
28 | #ifndef _BASEMENU_HH_ | ||
30 | #include "Basemenu.hh" | 29 | #include "Basemenu.hh" |
31 | #include "LinkedList.hh" | 30 | #endif |
31 | #ifndef _TIMER_HH_ | ||
32 | #include "Timer.hh" | 32 | #include "Timer.hh" |
33 | #endif | ||
34 | #ifndef _ICONBAR_HH_ | ||
33 | #include "IconBar.hh" | 35 | #include "IconBar.hh" |
36 | #endif | ||
34 | 37 | ||
35 | 38 | ||
36 | // forward declaration | 39 | // forward declaration |
@@ -94,13 +97,13 @@ private: | |||
94 | } hide_handler; | 97 | } hide_handler; |
95 | 98 | ||
96 | Fluxbox *fluxbox; | 99 | Fluxbox *fluxbox; |
97 | BImageControl *image_ctrl; | ||
98 | BScreen *screen; | 100 | BScreen *screen; |
101 | BImageControl *image_ctrl; | ||
99 | BTimer *clock_timer, *hide_timer; | 102 | BTimer *clock_timer, *hide_timer; |
100 | Toolbarmenu *toolbarmenu; | 103 | Toolbarmenu *toolbarmenu; |
101 | class IconBar *iconbar; | 104 | class IconBar *iconbar; |
102 | 105 | ||
103 | char *new_workspace_name, *new_name_pos; | 106 | std::string new_workspace_name; |
104 | 107 | ||
105 | friend class HideHandler; | 108 | friend class HideHandler; |
106 | friend class Toolbarmenu; | 109 | friend class Toolbarmenu; |
@@ -130,6 +133,7 @@ public: | |||
130 | { return ((hidden) ? frame.x_hidden : frame.x); } | 133 | { return ((hidden) ? frame.x_hidden : frame.x); } |
131 | inline const int &getY(void) const | 134 | inline const int &getY(void) const |
132 | { return ((hidden) ? frame.y_hidden : frame.y); } | 135 | { return ((hidden) ? frame.y_hidden : frame.y); } |
136 | inline IconBar *getIconBar(void) { return iconbar; } | ||
133 | 137 | ||
134 | void buttonPressEvent(XButtonEvent *); | 138 | void buttonPressEvent(XButtonEvent *); |
135 | void buttonReleaseEvent(XButtonEvent *); | 139 | void buttonReleaseEvent(XButtonEvent *); |
@@ -155,8 +159,8 @@ public: | |||
155 | 159 | ||
156 | virtual void timeout(void); | 160 | virtual void timeout(void); |
157 | 161 | ||
158 | enum { TopLeft = 1, BottomLeft, TopCenter, | 162 | enum Placement{ TOPLEFT = 1, BOTTOMLEFT, TOPCENTER, |
159 | BottomCenter, TopRight, BottomRight }; | 163 | BOTTOMCENTER, TOPRIGHT, BOTTOMRIGHT }; |
160 | }; | 164 | }; |
161 | 165 | ||
162 | 166 | ||