fix segfaut from uninitialized focused_screen pointer

[chaz/openbox] / src / Toolbar.h

diff --git a/src/Toolbar.h b/src/Toolbar.h
index ecf2fd2a194cf8b1a8ac929c41220f4ae3e924d9..a4326c1204186db33ad7f3dc2cb2a1689805ef6d 100644 (file)
--- 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 &);
@@ -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 *);