aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-01-09 18:33:58 (GMT)
committerfluxgen <fluxgen>2003-01-09 18:33:58 (GMT)
commita9579c3c44fb4fa3745d7ac581c106fd40bea155 (patch)
treec3c00a7c62b6c59215cd5b5276ccc5898ce500aa
parente48b3e0cfdbf9b73e4179c51beff857339254920 (diff)
downloadfluxbox-a9579c3c44fb4fa3745d7ac581c106fd40bea155.zip
fluxbox-a9579c3c44fb4fa3745d7ac581c106fd40bea155.tar.bz2
changed client menu to FbTk Menu
-rw-r--r--src/Workspace.cc5
-rw-r--r--src/Workspace.hh11
2 files changed, 7 insertions, 9 deletions
diff --git a/src/Workspace.cc b/src/Workspace.cc
index 9768350..6674c4e 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -22,13 +22,12 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Workspace.cc,v 1.39 2003/01/05 22:30:20 fluxgen Exp $ 25// $Id: Workspace.cc,v 1.40 2003/01/09 18:33:58 fluxgen Exp $
26 26
27#include "Workspace.hh" 27#include "Workspace.hh"
28 28
29#include "i18n.hh" 29#include "i18n.hh"
30#include "fluxbox.hh" 30#include "fluxbox.hh"
31#include "Clientmenu.hh"
32#include "Screen.hh" 31#include "Screen.hh"
33#include "Toolbar.hh" 32#include "Toolbar.hh"
34#include "Window.hh" 33#include "Window.hh"
@@ -77,7 +76,7 @@ Workspace::GroupList Workspace::m_groups;
77Workspace::Workspace(BScreen *scrn, unsigned int i): 76Workspace::Workspace(BScreen *scrn, unsigned int i):
78 screen(scrn), 77 screen(scrn),
79 lastfocus(0), 78 lastfocus(0),
80 m_clientmenu(*this), 79 m_clientmenu(*scrn->menuTheme(), scrn->getScreenNumber(), *scrn->getImageControl()),
81 m_name(""), 80 m_name(""),
82 m_id(i), 81 m_id(i),
83 cascade_x(32), cascade_y(32) { 82 cascade_x(32), cascade_y(32) {
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;