X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FToolbar.h;h=93d92055ef5696df7b6396d250790c1cd596a9ee;hb=f75083669f65aadd6b32f8ed25880ca362296a2f;hp=c1b3c2cd447adefb955e9b87ab5db052a2b9cb0e;hpb=66c879bd5c0c9f668096f620007388ef347becd0;p=chaz%2Fopenbox

diff --git a/src/Toolbar.h b/src/Toolbar.h
index c1b3c2cd..93d92055 100644
--- a/src/Toolbar.h
+++ b/src/Toolbar.h
@@ -29,6 +29,7 @@
 #include "Timer.h"
 #include "Resource.h"
 #include "Screen.h"
+#include "Geometry.h"
 
 // forward declaration
 class Toolbar;
@@ -56,6 +57,7 @@ private:
 protected:
   virtual void itemSelected(int, int);
   virtual void internal_hide();
+  virtual void setValues();
 
 public:
   Toolbarmenu(Toolbar &);
@@ -91,9 +93,9 @@ private:
   } hide_handler;
 
   Openbox &openbox;
+  BScreen &screen;
   Resource &config;
   BImageControl *image_ctrl;
-  BScreen &screen;
   BTimer *clock_timer, *hide_timer;
   Toolbarmenu *toolbarmenu;
 
@@ -113,12 +115,16 @@ public:
 
   inline const Window &getWindowID() const { return frame.window; }
 
-  inline unsigned int getWidth() const { return frame.width; }
-  inline unsigned int getHeight() const { return frame.height; }
+  //inline unsigned int getWidth() const { return frame.width; }
+  //inline unsigned int getHeight() const { return frame.height; }
   unsigned int getExposedHeight() const;
   
-  int getX() const;
-  int getY() const;
+  //int getX() const;
+  //int getY() const;
+
+  Rect area() const;
+  //Size size() const { return area().size(); }
+  //Point origin() const { return area().origin(); }
   
   void buttonPressEvent(XButtonEvent *);
   void buttonReleaseEvent(XButtonEvent *);
@@ -136,6 +142,7 @@ public:
   void edit();
   void reconfigure();
   void load();
+  void save();
   void mapToolbar();
   void unMapToolbar();
 #ifdef    HAVE_STRFTIME