1 files changed, 37 insertions, 45 deletions

diff --git a/src/Workspacemenu.cc b/src/Workspacemenu.cc
index 29033fa..16802f6 100644
--- a/src/Workspacemenu.cc
+++ b/src/Workspacemenu.cc
@@ -1,3 +1,5 @@
+// Workspacemenu.cc for Fluxbox
+// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
 // Workspacemenu.cc for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -19,66 +21,56 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// stupid macros needed to access some functions in version 2 of the GNU C
-// library
-#ifndef   _GNU_SOURCE
-#define   _GNU_SOURCE
-#endif // _GNU_SOURCE
+// $Id: Workspacemenu.cc,v 1.8 2002/08/14 22:57:55 fluxgen Exp $
 
-#ifdef    HAVE_CONFIG_H
-#  include "../config.h"
-#endif // HAVE_CONFIG_H
+#include "Workspacemenu.hh"
 
 #include "i18n.hh"
-#include "fluxbox.hh"
 #include "Screen.hh"
-#include "Toolbar.hh"
-#include "Workspacemenu.hh"
 #include "Workspace.hh"
 
+//use GNU extension
+#ifndef   _GNU_SOURCE
+#define   _GNU_SOURCE
+#endif // _GNU_SOURCE
+
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif // HAVE_CONFIG_H
+
+#include <iostream>
+#include <cassert>
 
 Workspacemenu::Workspacemenu(BScreen *scrn) : Basemenu(scrn) {
-        screen = scrn;
         
         setInternalMenu();
         I18n *i18n = I18n::instance();
-        
+        using namespace FBNLS;
         setLabel(i18n->getMessage(
-#ifdef    NLS
-                                        WorkspacemenuSet, WorkspacemenuWorkspacesTitle,
-#else // !NLS
-                                        0, 0,
-#endif // NLS
-                                        "Workspaces"));
-
+                WorkspacemenuSet, WorkspacemenuWorkspacesTitle,
+                "Workspaces"));
         insert(i18n->getMessage(
-#ifdef    NLS
-                                WorkspacemenuSet, WorkspacemenuNewWorkspace,
-#else // !NLS
-                                0, 0,
-#endif // NLS
-                                "New Workspace"));
+                WorkspacemenuSet, WorkspacemenuNewWorkspace,
+                "New Workspace"));
         insert(i18n->getMessage(
-#ifdef    NLS
-                                WorkspacemenuSet, WorkspacemenuRemoveLast,
-#else // !NLS
-                                0, 0,
-#endif // NLS
-                                "Remove Last"));
+                WorkspacemenuSet, WorkspacemenuRemoveLast,
+                "Remove Last"));
 }
 
 
-void Workspacemenu::itemSelected(int button, int index) {
-  if (button == 1) {
-    if (index == 0)
-      screen->addWorkspace();
-    else if (index == 1)
-      screen->removeLastWorkspace();
-    else if ((screen->getCurrentWorkspace()->getWorkspaceID() !=
-              (index - 2)) && ((index - 2) < screen->getCount()))
-      screen->changeWorkspaceID(index - 2);
-
-    if (! (screen->getWorkspacemenu()->isTorn() || isTorn()))
-      hide();
-  }
+void Workspacemenu::itemSelected(int button, unsigned int index) {
+        if (button == 1) {
+                if (index == 0)
+                        screen()->addWorkspace();
+                else if (index == 1)
+                        screen()->removeLastWorkspace();
+                else if ((screen()->getCurrentWorkspace()->workspaceID() !=
+                        (index - 2)) && ((index - 2) < screen()->getCount())) {
+                        screen()->changeWorkspaceID(index - 2);
+                }
+        
+                if (! (screen()->getWorkspacemenu()->isTorn() || isTorn()))
+                        hide();
+        }
 }
+