rename fieron to not have a cap letter

[chaz/openbox] / src / Basemenu.hh

diff --git a/src/Basemenu.hh b/src/Basemenu.hh
index d7339f0d33e9380751a58333864cc0b9dec04443..09c26028be204c2fafd87bc2cc817509e8d0a5ca 100644 (file)
--- 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,7 +52,7 @@ 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;