M src/Basemenu.hh → src/Basemenu.hh

@@ -29,18 +29,17 @@ #include <X11/Xlib.h>
 }
 
 #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;

M src/Timer.hh → src/Timer.hh

@@ -119,8 +119,8 @@ return *r < *l;
   }
 };
 
-#include <deque>
-typedef _timer_queue<BTimer*, std::deque<BTimer*>, TimerLessThan> TimerQueue;
+#include <vector>
+typedef _timer_queue<BTimer*, std::vector<BTimer*>, TimerLessThan> TimerQueue;
 
 class TimerQueueManager {
 public:

M src/Window.hh → src/Window.hh

@@ -255,7 +255,8 @@ BlackboxWindow& operator=(const BlackboxWindow&);
 
   bool getState(void);
   Window createToplevelWindow();
-  Window createChildWindow(Window parent, Cursor = None);
+  Window createChildWindow(Window parent, unsigned long event_mask,
+                           Cursor = None);
 
   bool getWindowType(void);
   void updateStrut(void);