aboutsummaryrefslogtreecommitdiff
path: root/src/Workspace.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Workspace.hh')
-rw-r--r--src/Workspace.hh11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/Workspace.hh b/src/Workspace.hh
index ae8f456..514f346 100644
--- a/src/Workspace.hh
+++ b/src/Workspace.hh
@@ -25,10 +25,10 @@
25#ifndef WORKSPACE_HH 25#ifndef WORKSPACE_HH
26#define WORKSPACE_HH 26#define WORKSPACE_HH
27 27
28
29#include "Clientmenu.hh"
30#include "NotCopyable.hh" 28#include "NotCopyable.hh"
31 29
30#include "Menu.hh"
31
32#include <X11/Xlib.h> 32#include <X11/Xlib.h>
33 33
34#include <string> 34#include <string>
@@ -70,9 +70,8 @@ public:
70 70
71 const BScreen *getScreen() const { return screen; } 71 const BScreen *getScreen() const { return screen; }
72 const FluxboxWindow *getLastFocusedWindow() const { return lastfocus; } 72 const FluxboxWindow *getLastFocusedWindow() const { return lastfocus; }
73 Clientmenu &menu() { return m_clientmenu; } 73 FbTk::Menu &menu() { return m_clientmenu; }
74 /// client menu 74 inline const FbTk::Menu &menu() const { return m_clientmenu; }
75 inline const Clientmenu &menu() const { return m_clientmenu; }
76 /// name of this workspace 75 /// name of this workspace
77 inline const std::string &name() const { return m_name; } 76 inline const std::string &name() const { return m_name; }
78 /** 77 /**
@@ -103,7 +102,7 @@ private:
103 102
104 BScreen *screen; 103 BScreen *screen;
105 FluxboxWindow *lastfocus; 104 FluxboxWindow *lastfocus;
106 Clientmenu m_clientmenu; 105 FbTk::Menu m_clientmenu;
107 106
108 typedef std::list<FluxboxWindow *> WindowStack; 107 typedef std::list<FluxboxWindow *> WindowStack;
109 typedef std::vector<std::string> Group; 108 typedef std::vector<std::string> Group;