1 files changed, 55 insertions, 62 deletions

diff --git a/src/Basemenu.hh b/src/Basemenu.hh
index 27aed54..14f7c67 100644
--- a/src/Basemenu.hh
+++ b/src/Basemenu.hh
@@ -1,3 +1,6 @@
+// Basemenu.hh for Fluxbox Window manager
+// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
+//
 // Basemenu.hh for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -19,10 +22,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef   __Basemenu_hh
-#define   __Basemenu_hh
+// $Id: Basemenu.hh,v 1.7 2002/02/17 19:00:04 fluxgen Exp $
+
+#ifndef   BASEMENU_HH
+#define   BASEMENU_HH
 
 #include <X11/Xlib.h>
+#include <vector>
+#include <string>
 
 // forward declarations
 class Basemenu;
@@ -32,12 +39,10 @@ class Fluxbox;
 class BImageControl;
 class BScreen;
 
-#include "LinkedList.hh"
-
-
 class Basemenu {
 private:
-  LinkedList<BasemenuItem> *menuitems;
+        typedef std::vector<BasemenuItem *> Menuitems;
+        Menuitems menuitems;
   Fluxbox *fluxbox;
   Basemenu *parent;
   BImageControl *image_ctrl;
@@ -61,7 +66,7 @@ private:
 
 
 protected:
-  inline BasemenuItem *find(int index) { return menuitems->find(index); }
+  inline BasemenuItem *find(int index) { return menuitems[index]; }
   inline void setTitleVisibility(Bool b) { title_vis = b; }
   inline void setMovable(Bool b) { movable = b; }
   inline void setHideTree(Bool h) { hide_tree = h; }
@@ -94,7 +99,7 @@ public:
 
   inline const int &getX(void) const { return menu.x; }
   inline const int &getY(void) const { return menu.y; }
-  inline int getCount(void) { return menuitems->count(); }
+  inline int getCount(void) { return menuitems.size(); }
   inline const int &getCurrentSubmenu(void) const { return which_sub; }
 
   inline const unsigned int &getWidth(void) const { return menu.width; }
@@ -128,65 +133,53 @@ public:
   virtual void show(void);
   virtual void hide(void);
 
-  enum { AlignDontCare = 1, AlignTop, AlignBottom };
-  enum { Right = 1, Left };
-  enum { Empty = 0, Square, Triangle, Diamond };
-};
+  enum { ALIGNDONTCARE = 1, ALIGNTOP, ALIGNBOTTOM };
+  enum { RIGHT = 1, LEFT };
+  enum { EMPTY = 0, SQUARE, TRIANGLE, DIAMOND };
 
+};
 
 class BasemenuItem {
-private:
-  Basemenu *s;
-  const char **u, *l, *e;
-  int f, enabled, selected;
-
-  friend class Basemenu;
-
-
-protected:
+public:
+        BasemenuItem(
+                        const char *label,
+                        int function,
+                        const char *exec = (const char *) 0)
+                : m_label(label ? label : "")
+                , m_exec(exec ? exec : "")
+                , m_submenu(0)
+                , m_function(function)
+                , m_enabled(true)
+                , m_selected(false)
+        { }
+
+        BasemenuItem(const char *label, Basemenu *submenu)
+                : m_label(label ? label : "")
+                , m_exec("")
+                , m_submenu(submenu)
+                , m_function(0)
+                , m_enabled(true)
+                , m_selected(false)
+        { }
+
+        inline const char *exec(void) const { return m_exec.c_str(); }
+        inline const char *label(void) const { return m_label.c_str(); }
+        inline int function(void) const { return m_function; }
+        inline Basemenu *submenu(void) { return m_submenu; }
+
+        inline bool isEnabled(void) const { return m_enabled; }
+        inline void setEnabled(bool enabled) { m_enabled = enabled; }
+        inline bool isSelected(void) const { return m_selected; }
+        inline void setSelected(bool selected) { m_selected = selected; }
 
+private:
+        std::string m_label, m_exec;
+        Basemenu *m_submenu;
+        int m_function;
+        bool m_enabled, m_selected;
 
-public:
-  BasemenuItem(const char *lp, int fp, const char *ep = (const char *) 0) {
-    l = lp;
-    e = ep;
-    s = 0;
-    f = fp;
-    u = 0;
-    enabled = 1;
-    selected = 0;
-  }
-
-  BasemenuItem(const char *lp, Basemenu *mp) {
-    l = lp;
-    s = mp;
-    e = 0;
-    f = 0;
-    u = 0;
-    enabled = 1;
-    selected = 0;
-  }
-
-  BasemenuItem(const char **up, int fp) {
-    u = up;
-    l = e = 0;
-    f = fp;
-    s = 0;
-    enabled = 1;
-    selected = 0;
-  }
-
-  inline const char *exec(void) const { return e; }
-  inline const char *label(void) const { return l; }
-  inline const char **ulabel(void) const { return u; }
-  inline const int &function(void) const { return f; }
-  inline Basemenu *submenu(void) { return s; }
-
-  inline const int &isEnabled(void) const { return enabled; }
-  inline void setEnabled(int e) { enabled = e; }
-  inline const int &isSelected(void) const { return selected; }
-  inline void setSelected(int s) { selected = s; }
+        friend class Basemenu;
 };
 
 
-#endif // __Basemenu_hh
+#endif // _BASEMENU_HH_