X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FBasemenu.hh;h=09c26028be204c2fafd87bc2cc817509e8d0a5ca;hb=01a6d810b6b35288410ed43819a940749d92362f;hp=87592ec5865597b5ac2647d3f1ae093fcceac179;hpb=20063c22469643e8eb9c32bcc4b996f9640c9baf;p=chaz%2Fopenbox

diff --git a/src/Basemenu.hh b/src/Basemenu.hh
index 87592ec5..09c26028 100644
--- a/src/Basemenu.hh
+++ b/src/Basemenu.hh
@@ -29,18 +29,17 @@ extern "C" {
 }
 
 #include <string>
-#include <deque>
+#include <vector>
 
 class Blackbox;
 class BImageControl;
 class BScreen;
-class Basemenu;
 class BasemenuItem;
 
 
 class Basemenu {
 private:
-  typedef std::deque<BasemenuItem*> MenuItems;
+  typedef std::vector<BasemenuItem*> MenuItems;
   MenuItems menuitems;
   Blackbox *blackbox;
   Basemenu *parent;
@@ -53,12 +52,11 @@ private:
   int which_sub, which_press, which_sbl, alignment;
 
   struct _menu {
-    Pixmap frame_pixmap, title_pixmap, hilite_pixmap, sel_pixmap;
+    Pixmap frame_pixmap, title_pixmap, hilite_pixmap;
     Window window, frame, title;
 
     std::string label;
-    int x, y, x_move, y_move, x_shift, y_shift, sublevels, persub, minsub,
-      grab_x, grab_y;
+    int x, y, x_move, y_move, x_shift, y_shift, sublevels, persub, minsub;
     unsigned int width, height, title_h, frame_h, item_w, item_h, bevel_w,
       bevel_h;
   } menu;
@@ -67,7 +65,6 @@ private:
   Basemenu& operator=(const Basemenu&);
 
 protected:
-  BasemenuItem *find(int index);
   inline void setTitleVisibility(bool b) { title_vis = b; }
   inline void setMovable(bool b) { movable = b; }
   inline void setHideTree(bool h) { hide_tree = h; }
@@ -106,6 +103,7 @@ public:
   inline int getY(void) const { return menu.y; }
   inline unsigned int getCount(void) { return menuitems.size(); }
   inline int getCurrentSubmenu(void) const { return which_sub; }
+  BasemenuItem *find(int index);
 
   inline unsigned int getWidth(void) const { return menu.width; }
   inline unsigned int getHeight(void) const { return menu.height; }
@@ -163,8 +161,6 @@ public:
                                                      f(0), enabled(1),
                                                      selected(0) {}
 
-  ~BasemenuItem(void);
-
   inline const char *exec(void) const { return e.c_str(); }
   inline const char *label(void) const { return l.c_str(); }
   inline int function(void) const { return f; }