X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FBasemenu.h;h=83ea35670348b2f902219bb52bf612d93e11d600;hb=b7d0a77d16e034097a15fb7a7175e0882f6dd429;hp=fc9c894c121f3471eeeb1adbf31bc8a010bc172b;hpb=351f1d03315b84887b7532c35bdd8a49bdce1d43;p=chaz%2Fopenbox diff --git a/src/Basemenu.h b/src/Basemenu.h index fc9c894c..83ea3567 100644 --- a/src/Basemenu.h +++ b/src/Basemenu.h @@ -30,12 +30,12 @@ class BImageControl; class BScreen; class Basemenu; class BasemenuItem; -#include "LinkedList.h" - +#include +typedef std::vector menuitemList; class Basemenu { private: - LinkedList *menuitems; + menuitemList menuitems; Openbox &openbox; Basemenu *parent; BImageControl *image_ctrl; @@ -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; } @@ -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; }