changed OpenboxWindow to not have getFrameX/getWidth/etc functions, and to return...

[chaz/openbox] / src / Configmenu.h

diff --git a/src/Configmenu.h b/src/Configmenu.h
index c9d8f805bc2003569cc5e40ef41a7cb4365bbef5..b39fac67c474415bdaccb99b3610eaf72e5f46b7 100644 (file)
--- a/src/Configmenu.h
+++ b/src/Configmenu.h
@@ -54,8 +54,7 @@ private:
     Placementmenu(Configmenu *);
   };
 
-  Openbox *openbox;
-  BScreen *screen;
+  BScreen &screen;
   Focusmenu *focusmenu;
   Placementmenu *placementmenu;
 
@@ -66,7 +65,7 @@ protected:
   virtual void itemSelected(int, int);
 
 public:
-  Configmenu(BScreen *);
+  Configmenu(BScreen &);
   virtual ~Configmenu(void);
 
   inline Basemenu *getFocusmenu(void) { return focusmenu; }