aboutsummaryrefslogtreecommitdiff
path: root/src/Basemenu.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Basemenu.hh')
-rw-r--r--src/Basemenu.hh12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Basemenu.hh b/src/Basemenu.hh
index 24c8078..af40983 100644
--- a/src/Basemenu.hh
+++ b/src/Basemenu.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Basemenu.hh,v 1.4 2002/01/11 09:24:46 fluxgen Exp $ 25// $Id: Basemenu.hh,v 1.5 2002/02/04 22:33:09 fluxgen Exp $
26 26
27#ifndef _BASEMENU_HH_ 27#ifndef _BASEMENU_HH_
28#define _BASEMENU_HH_ 28#define _BASEMENU_HH_
@@ -37,12 +37,12 @@ class Fluxbox;
37class BImageControl; 37class BImageControl;
38class BScreen; 38class BScreen;
39 39
40#include "LinkedList.hh" 40#include <vector>
41
42 41
43class Basemenu { 42class Basemenu {
44private: 43private:
45 LinkedList<BasemenuItem> *menuitems; 44 typedef std::vector<BasemenuItem *> Menuitems;
45 Menuitems menuitems;
46 Fluxbox *fluxbox; 46 Fluxbox *fluxbox;
47 Basemenu *parent; 47 Basemenu *parent;
48 BImageControl *image_ctrl; 48 BImageControl *image_ctrl;
@@ -66,7 +66,7 @@ private:
66 66
67 67
68protected: 68protected:
69 inline BasemenuItem *find(int index) { return menuitems->find(index); } 69 inline BasemenuItem *find(int index) { return menuitems[index]; }
70 inline void setTitleVisibility(Bool b) { title_vis = b; } 70 inline void setTitleVisibility(Bool b) { title_vis = b; }
71 inline void setMovable(Bool b) { movable = b; } 71 inline void setMovable(Bool b) { movable = b; }
72 inline void setHideTree(Bool h) { hide_tree = h; } 72 inline void setHideTree(Bool h) { hide_tree = h; }
@@ -99,7 +99,7 @@ public:
99 99
100 inline const int &getX(void) const { return menu.x; } 100 inline const int &getX(void) const { return menu.x; }
101 inline const int &getY(void) const { return menu.y; } 101 inline const int &getY(void) const { return menu.y; }
102 inline int getCount(void) { return menuitems->count(); } 102 inline int getCount(void) { return menuitems.size(); }
103 inline const int &getCurrentSubmenu(void) const { return which_sub; } 103 inline const int &getCurrentSubmenu(void) const { return which_sub; }
104 104
105 inline const unsigned int &getWidth(void) const { return menu.width; } 105 inline const unsigned int &getWidth(void) const { return menu.width; }