aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Toolbar.hh21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index 7cc08b1..2c04bf8 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.11 2002/08/04 15:55:13 fluxgen Exp $ 25// $Id: Toolbar.hh,v 1.12 2002/10/29 16:08:42 fluxgen Exp $
26 26
27#ifndef TOOLBAR_HH 27#ifndef TOOLBAR_HH
28#define TOOLBAR_HH 28#define TOOLBAR_HH
@@ -129,12 +129,12 @@ public:
129 */ 129 */
130 inline Window getWindowID() const { return frame.window; } 130 inline Window getWindowID() const { return frame.window; }
131 131
132 inline unsigned int getWidth() const { return frame.width; } 132 inline unsigned int width() const { return frame.width; }
133 inline unsigned int getHeight() const { return frame.height; } 133 inline unsigned int height() const { return frame.height; }
134 inline unsigned int getExposedHeight() const { return ((do_auto_hide) ? frame.bevel_w : frame.height); } 134 inline unsigned int getExposedHeight() const { return ((do_auto_hide) ? frame.bevel_w : frame.height); }
135 inline int getX() const { return ((hidden) ? frame.x_hidden : frame.x); } 135 inline int x() const { return ((hidden) ? frame.x_hidden : frame.x); }
136 inline int getY() const { return ((hidden) ? frame.y_hidden : frame.y); } 136 inline int y() const { return ((hidden) ? frame.y_hidden : frame.y); }
137 inline IconBar *getIconBar() { return iconbar; } 137 inline const IconBar *iconBar() const { return iconbar; }
138 /** 138 /**
139 @name eventhandlers 139 @name eventhandlers
140 */ 140 */
@@ -188,17 +188,16 @@ private:
188 public: 188 public:
189 Toolbar *toolbar; 189 Toolbar *toolbar;
190 190
191 virtual void timeout(void); 191 virtual void timeout();
192 } hide_handler; 192 } hide_handler;
193 193
194 Fluxbox *fluxbox; ///< obsolete 194 BScreen *screen;
195 BScreen *screen; ///< screen on wich this toolbar exist
196 BImageControl *image_ctrl; 195 BImageControl *image_ctrl;
197 BTimer clock_timer, *hide_timer; 196 BTimer clock_timer, hide_timer;
198 Toolbarmenu *toolbarmenu; 197 Toolbarmenu *toolbarmenu;
199 IconBar *iconbar; 198 IconBar *iconbar;
200 199
201 std::string new_workspace_name; ///< temp variable in edit mode 200 std::string new_workspace_name; ///< temp variable in edit workspace name mode
202 201
203 friend class HideHandler; 202 friend class HideHandler;
204 friend class Toolbarmenu; 203 friend class Toolbarmenu;