X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FBasemenu.hh;h=09c26028be204c2fafd87bc2cc817509e8d0a5ca;hb=6b1459e6f08d0759ed7b88f0748012d53962f2b3;hp=23da10ee4ec7c3f696e20076735a945b4962a9a2;hpb=1766453ca2ce30adf84798cb504e8b4d258bd08f;p=chaz%2Fopenbox

diff --git a/src/Basemenu.hh b/src/Basemenu.hh
index 23da10ee..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;