sync with blackbox
get rid of the default limit on window sizes
This commit is contained in:
parent
85612861f5
commit
a6d6f0118b
3 changed files with 6 additions and 6 deletions
|
@ -29,18 +29,17 @@ extern "C" {
|
||||||
}
|
}
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <deque>
|
#include <vector>
|
||||||
|
|
||||||
class Blackbox;
|
class Blackbox;
|
||||||
class BImageControl;
|
class BImageControl;
|
||||||
class BScreen;
|
class BScreen;
|
||||||
class Basemenu;
|
|
||||||
class BasemenuItem;
|
class BasemenuItem;
|
||||||
|
|
||||||
|
|
||||||
class Basemenu {
|
class Basemenu {
|
||||||
private:
|
private:
|
||||||
typedef std::deque<BasemenuItem*> MenuItems;
|
typedef std::vector<BasemenuItem*> MenuItems;
|
||||||
MenuItems menuitems;
|
MenuItems menuitems;
|
||||||
Blackbox *blackbox;
|
Blackbox *blackbox;
|
||||||
Basemenu *parent;
|
Basemenu *parent;
|
||||||
|
|
|
@ -119,8 +119,8 @@ struct TimerLessThan {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
#include <deque>
|
#include <vector>
|
||||||
typedef _timer_queue<BTimer*, std::deque<BTimer*>, TimerLessThan> TimerQueue;
|
typedef _timer_queue<BTimer*, std::vector<BTimer*>, TimerLessThan> TimerQueue;
|
||||||
|
|
||||||
class TimerQueueManager {
|
class TimerQueueManager {
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -255,7 +255,8 @@ private:
|
||||||
|
|
||||||
bool getState(void);
|
bool getState(void);
|
||||||
Window createToplevelWindow();
|
Window createToplevelWindow();
|
||||||
Window createChildWindow(Window parent, Cursor = None);
|
Window createChildWindow(Window parent, unsigned long event_mask,
|
||||||
|
Cursor = None);
|
||||||
|
|
||||||
bool getWindowType(void);
|
bool getWindowType(void);
|
||||||
void updateStrut(void);
|
void updateStrut(void);
|
||||||
|
|
Loading…
Reference in a new issue