fix segfaut from uninitialized focused_screen pointer

[chaz/openbox] / src / Basemenu.h

diff --git a/src/Basemenu.h b/src/Basemenu.h
index ba28404c608879181de43cf727aca72cc82ea664..83ea35670348b2f902219bb52bf612d93e11d600 100644 (file)
--- a/src/Basemenu.h
+++ b/src/Basemenu.h
@@ -30,16 +30,16 @@ class BImageControl;
 class BScreen;
 class Basemenu;
 class BasemenuItem;
-#include "LinkedList.h"
-
+#include <vector>
+typedef std::vector<BasemenuItem *> menuitemList;
 
 class Basemenu {
 private:
-  LinkedList<BasemenuItem> *menuitems;
-  Openbox *openbox;
+  menuitemList menuitems;
+  Openbox &openbox;
   Basemenu *parent;
   BImageControl *image_ctrl;
-  BScreen *screen;
+  BScreen &screen;
 
   Bool moving, visible, movable, torn, internal_menu, title_vis, shifted,
     hide_tree;
@@ -59,7 +59,7 @@ private:
 
 
 protected:
-  inline BasemenuItem *find(int index) { return menuitems->find(index); }
+  inline BasemenuItem *find(int index) { return menuitems[index]; }
   inline void setTitleVisibility(Bool b) { title_vis = b; }
   inline void setMovable(Bool b) { movable = b; }
   inline void setHideTree(Bool h) { hide_tree = h; }
@@ -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; }
 
@@ -93,7 +93,7 @@ public:
 
   inline const int &getX(void) const { return menu.x; }
   inline const int &getY(void) const { return menu.y; }
-  inline int getCount(void) { return menuitems->count(); }
+  inline int getCount(void) { return menuitems.size(); }
   inline const int &getCurrentSubmenu(void) const { return which_sub; }
 
   inline const unsigned int &getWidth(void) const { return menu.width; }