From a6d6f0118be066b9bb86e681aa67eca715f4fc69 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 26 Aug 2002 05:27:25 +0000 Subject: [PATCH] sync with blackbox get rid of the default limit on window sizes --- src/Basemenu.hh | 5 ++--- src/Timer.hh | 4 ++-- src/Window.hh | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Basemenu.hh b/src/Basemenu.hh index 082b8c4c..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; diff --git a/src/Timer.hh b/src/Timer.hh index a4b04010..f13ad4dc 100644 --- a/src/Timer.hh +++ b/src/Timer.hh @@ -119,8 +119,8 @@ struct TimerLessThan { } }; -#include -typedef _timer_queue, TimerLessThan> TimerQueue; +#include +typedef _timer_queue, TimerLessThan> TimerQueue; class TimerQueueManager { public: diff --git a/src/Window.hh b/src/Window.hh index 02c15bcb..74a562a0 100644 --- 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); -- 2.39.2