Fixed bsetroot to use the new Geometries returned in ScreenInfo

[chaz/openbox] / src / Toolbar.h

diff --git a/src/Toolbar.h b/src/Toolbar.h
index 17c4698440fa53aeffb9157777d6c9aee23045fe..45962c95ef882b8cd323f0aa8c8227de87cb8517 100644 (file)
--- a/src/Toolbar.h
+++ b/src/Toolbar.h
@@ -35,16 +35,16 @@ class Toolbarmenu : public Basemenu {
 private:
   class Placementmenu : public Basemenu {
   private:
-    Toolbarmenu *toolbarmenu;
+    Toolbarmenu &toolbarmenu;
 
   protected:
     virtual void itemSelected(int, int);
 
   public:
-    Placementmenu(Toolbarmenu *);
+    Placementmenu(Toolbarmenu &);
   };
 
-  Toolbar *toolbar;
+  Toolbar &toolbar;
   Placementmenu *placementmenu;
 
   friend class Placementmenu;
@@ -56,7 +56,7 @@ protected:
   virtual void internal_hide(void);
 
 public:
-  Toolbarmenu(Toolbar *);
+  Toolbarmenu(Toolbar &);
   ~Toolbarmenu(void);
 
   inline Basemenu *getPlacementmenu(void) { return placementmenu; }
@@ -88,9 +88,9 @@ private:
     virtual void timeout(void);
   } hide_handler;
 
-  Openbox *openbox;
+  Openbox &openbox;
   BImageControl *image_ctrl;
-  BScreen *screen;
+  BScreen &screen;
   BTimer *clock_timer, *hide_timer;
   Toolbarmenu *toolbarmenu;
 
@@ -103,7 +103,7 @@ private:
 
 
 public:
-  Toolbar(BScreen *);
+  Toolbar(BScreen &);
   virtual ~Toolbar(void);
 
   inline Toolbarmenu *getMenu(void) { return toolbarmenu; }