added XAtom class, and it all now compiles.

[chaz/openbox] / src / Workspacemenu.cc

diff --git a/src/Workspacemenu.cc b/src/Workspacemenu.cc
index bec5f4553ae02fa6429d4454d99d07289136690d..a97bdfefe829925a777a2c4ad587040923bdb501 100644 (file)
--- a/src/Workspacemenu.cc
+++ b/src/Workspacemenu.cc
@@ -38,17 +38,15 @@
 #include "Workspace.h"
 
 
-Workspacemenu::Workspacemenu(BScreen *scrn) : Basemenu(scrn) {
-  screen = scrn;
-
+Workspacemenu::Workspacemenu(BScreen &scrn) : Basemenu(scrn), screen(scrn) {
   setInternalMenu();
 
-  setLabel(i18n->getMessage(WorkspacemenuSet, WorkspacemenuWorkspacesTitle,
-                           "Workspaces"));
-  insert(i18n->getMessage(WorkspacemenuSet, WorkspacemenuNewWorkspace,
-                         "New Workspace"));
-  insert(i18n->getMessage(WorkspacemenuSet, WorkspacemenuRemoveLast,
-                         "Remove Last"));
+  setLabel(i18n(WorkspacemenuSet, WorkspacemenuWorkspacesTitle,
+                "Workspaces"));
+  insert(i18n(WorkspacemenuSet, WorkspacemenuNewWorkspace,
+              "New Workspace"));
+  insert(i18n(WorkspacemenuSet, WorkspacemenuRemoveLast,
+              "Remove Last"));
 }
 
 
@@ -57,13 +55,13 @@ void Workspacemenu::itemSelected(int button, int index) {
     return;
 
   if (index == 0)
-    screen->addWorkspace();
+    screen.addWorkspace();
   else if (index == 1)
-    screen->removeLastWorkspace();
-  else if ((screen->getCurrentWorkspace()->getWorkspaceID() !=
-           (index - 2)) && ((index - 2) < screen->getCount()))
-    screen->changeWorkspaceID(index - 2);
+    screen.removeLastWorkspace();
+  else if ((screen.getCurrentWorkspace()->getWorkspaceID() !=
+            (index - 2)) && ((index - 2) < screen.getWorkspaceCount()))
+    screen.changeWorkspaceID(index - 2);
 
-  if (! (screen->getWorkspacemenu()->isTorn() || isTorn()))
+  if (! (screen.getWorkspacemenu()->isTorn() || isTorn()))
     hide();
 }