M src/Workspace.cc → src/Workspace.cc

@@ -22,13 +22,12 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Workspace.cc,v 1.39 2003/01/05 22:30:20 fluxgen Exp $
+// $Id: Workspace.cc,v 1.40 2003/01/09 18:33:58 fluxgen Exp $
 
 #include "Workspace.hh"
 
 #include "i18n.hh"
 #include "fluxbox.hh"
-#include "Clientmenu.hh"
 #include "Screen.hh"
 #include "Toolbar.hh"
 #include "Window.hh"
@@ -77,7 +76,7 @@ 
 Workspace::Workspace(BScreen *scrn, unsigned int i):
     screen(scrn),
     lastfocus(0),
-    m_clientmenu(*this),
+    m_clientmenu(*scrn->menuTheme(), scrn->getScreenNumber(), *scrn->getImageControl()),
     m_name(""),
     m_id(i),
     cascade_x(32), cascade_y(32) {

M src/Workspace.hh → src/Workspace.hh

@@ -25,9 +25,9 @@ 
 #ifndef	 WORKSPACE_HH
 #define	 WORKSPACE_HH
 
-
-#include "Clientmenu.hh"
 #include "NotCopyable.hh"
+
+#include "Menu.hh"
 
 #include <X11/Xlib.h>
 
@@ -70,9 +70,8 @@ FluxboxWindow *getLastFocusedWindow() { return lastfocus; }
 
     const BScreen *getScreen() const { return screen; }	
     const FluxboxWindow *getLastFocusedWindow() const { return lastfocus; }	
-    Clientmenu &menu() { return m_clientmenu; }
-    ///	client menu 
-    inline const Clientmenu &menu() const { return m_clientmenu; }
+    FbTk::Menu &menu() { return m_clientmenu; }
+    inline const FbTk::Menu &menu() const { return m_clientmenu; }
     ///	name of this workspace
     inline const std::string &name() const { return m_name; }
     /**
@@ -103,7 +102,7 @@ void lowerAndFillStack(Stack::iterator &it, const FluxboxWindow &win);
 
     BScreen *screen;
     FluxboxWindow *lastfocus;
-    Clientmenu m_clientmenu;
+    FbTk::Menu m_clientmenu;
 
     typedef std::list<FluxboxWindow *> WindowStack;
     typedef std::vector<std::string> Group;