changed screen pointer to reference

This commit is contained in:
fluxgen 2003-02-16 16:32:43 +00:00
parent 453e220df9
commit 9db6e01895

View file

@ -47,7 +47,8 @@ public:
typedef std::vector<FluxboxWindow *> Windows; typedef std::vector<FluxboxWindow *> Windows;
typedef std::vector<Window> Stack; typedef std::vector<Window> Stack;
explicit Workspace(BScreen *screen, FbTk::MultLayers &layermanager, unsigned int workspaceid = 0); Workspace(BScreen &screen, FbTk::MultLayers &layermanager,
unsigned int workspaceid = 0);
~Workspace(); ~Workspace();
void setLastFocusedWindow(FluxboxWindow *w); void setLastFocusedWindow(FluxboxWindow *w);
@ -64,10 +65,10 @@ public:
void shutdown(); void shutdown();
int addWindow(FluxboxWindow *win, bool place = false); int addWindow(FluxboxWindow *win, bool place = false);
int removeWindow(FluxboxWindow *win); int removeWindow(FluxboxWindow *win);
BScreen *getScreen() { return screen; } BScreen &getScreen() { return screen; }
FluxboxWindow *getLastFocusedWindow() { return lastfocus; } FluxboxWindow *getLastFocusedWindow() { return lastfocus; }
const BScreen *getScreen() const { return screen; } const BScreen &getScreen() const { return screen; }
const FluxboxWindow *getLastFocusedWindow() const { return lastfocus; } const FluxboxWindow *getLastFocusedWindow() const { return lastfocus; }
FbTk::Menu &menu() { return m_clientmenu; } FbTk::Menu &menu() { return m_clientmenu; }
inline const FbTk::Menu &menu() const { return m_clientmenu; } inline const FbTk::Menu &menu() const { return m_clientmenu; }
@ -96,7 +97,7 @@ protected:
private: private:
BScreen *screen; BScreen &screen;
FluxboxWindow *lastfocus; FluxboxWindow *lastfocus;
FbTk::Menu m_clientmenu; FbTk::Menu m_clientmenu;