fixed memory leaks for strftime_format and rootcommand

[chaz/openbox] / src / Basemenu.h

diff --git a/src/Basemenu.h b/src/Basemenu.h
index ba28404c608879181de43cf727aca72cc82ea664..fc9c894c121f3471eeeb1adbf31bc8a010bc172b 100644 (file)
--- a/src/Basemenu.h
+++ b/src/Basemenu.h
@@ -36,10 +36,10 @@ class BasemenuItem;
 class Basemenu {
 private:
   LinkedList<BasemenuItem> *menuitems;
-  Openbox *openbox;
+  Openbox &openbox;
   Basemenu *parent;
   BImageControl *image_ctrl;
-  BScreen *screen;
+  BScreen &screen;
 
   Bool moving, visible, movable, torn, internal_menu, title_vis, shifted,
     hide_tree;
@@ -74,13 +74,13 @@ protected:
 
 
 public:
-  Basemenu(BScreen *);
+  Basemenu(BScreen &);
   virtual ~Basemenu(void);
 
   inline const Bool &isTorn(void) const { return torn; }
   inline const Bool &isVisible(void) const { return visible; }
 
-  inline BScreen *getScreen(void) { return screen; }
+  inline BScreen &getScreen(void) { return screen; }
 
   inline const Window &getWindowID(void) const { return menu.window; }