new root dir based on bb-cvs

[chaz/openbox] / src / Iconmenu.cc

diff --git a/src/Iconmenu.cc b/src/Iconmenu.cc
index 32ae67a48ceb1a1f721330d988fc4009725595e7..984cdfa919acc38877cf9599a1f423fd2c759586 100644 (file)
--- a/src/Iconmenu.cc
+++ b/src/Iconmenu.cc
@@ -1,4 +1,4 @@
-// Icon.cc for Openbox
+// Iconmenu.cc for Openbox
 // Copyright (c) 2001 Sean 'Shaleh' Perry <shaleh@debian.org>
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -36,12 +36,10 @@
 #include "Window.h"
 
 
-Iconmenu::Iconmenu(BScreen *scrn) : Basemenu(scrn) {
+Iconmenu::Iconmenu(BScreen &scrn) : Basemenu(scrn), screen(scrn) {
   setInternalMenu();
 
-  screen = scrn;
-
-  setLabel(i18n->getMessage(IconSet, IconIcons, "Icons"));
+  setLabel(i18n(IconSet, IconIcons, "Icons"));
   update();
 }
 
@@ -50,8 +48,8 @@ void Iconmenu::itemSelected(int button, int index) {
   if (button != 1)
     return;
 
-  if (index >= 0 && index < screen->getIconCount()) {
-    OpenboxWindow *win = screen->getIcon(index);
+  if (index >= 0 && index < screen.getIconCount()) {
+    OpenboxWindow *win = screen.getIcon(index);
 
     if (win) {
       win->deiconify();
@@ -59,6 +57,6 @@ void Iconmenu::itemSelected(int button, int index) {
     }
   }
 
-  if (! (screen->getWorkspacemenu()->isTorn() || isTorn()))
+  if (! (screen.getWorkspacemenu()->isTorn() || isTorn()))
     hide();
 }