sync with blackbox

get rid of the default limit on window sizes

diff --git a/src/Basemenu.hh b/src/Basemenu.hh
index 082b8c4..09c2602 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;

diff --git a/src/Timer.hh b/src/Timer.hh
index a4b0401..f13ad4d 100644 (file)
--- a/src/Timer.hh
+++ b/src/Timer.hh
@@ -119,8 +119,8 @@ struct TimerLessThan {
   }
 };
 
-#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:

diff --git a/src/Window.hh b/src/Window.hh
index 02c15bc..74a562a 100644 (file)
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -255,7 +255,8 @@ private:
 
   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);