X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FBasemenu.hh;h=09c26028be204c2fafd87bc2cc817509e8d0a5ca;hb=6b1459e6f08d0759ed7b88f0748012d53962f2b3;hp=d7339f0d33e9380751a58333864cc0b9dec04443;hpb=300491ce5a932ba777274e7f5c3d085f5ca59ee0;p=chaz%2Fopenbox diff --git a/src/Basemenu.hh b/src/Basemenu.hh index d7339f0d..09c26028 100644 --- a/src/Basemenu.hh +++ b/src/Basemenu.hh @@ -29,18 +29,17 @@ extern "C" { } #include -#include +#include class Blackbox; class BImageControl; class BScreen; -class Basemenu; class BasemenuItem; class Basemenu { private: - typedef std::deque MenuItems; + typedef std::vector 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;