1 files changed, 31 insertions, 19 deletions

diff --git a/src/IconBar.hh b/src/IconBar.hh
index f6b7509..428fbf0 100644
--- a/src/IconBar.hh
+++ b/src/IconBar.hh
@@ -1,5 +1,5 @@
-// IconBar.hh
-// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org)
+// IconBar.hh for Fluxbox Window Manager
+// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
@@ -18,55 +18,67 @@
 // 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.
-#ifndef _ICONBAR_HH_
-#define _ICONBAR_HH_
 
-#include <vector>
+// $Id: IconBar.hh,v 1.7 2002/08/04 15:55:13 fluxgen Exp $
+
+#ifndef ICONBAR_HH
+#define ICONBAR_HH
+
 #include "Window.hh"
-#include "LinkedList.hh"
 
-class Fluxbox;
+#include <list>
 
+/**
+        Icon object in IconBar
+*/
 class IconBarObj
 {
 public: 
         IconBarObj(FluxboxWindow *fluxboxwin, Window iconwin);
         ~IconBarObj();
-        inline Window getIconWin(void) { return m_iconwin; }
-        inline FluxboxWindow *getFluxboxWin(void)  { return m_fluxboxwin; }
+        Window getIconWin() const { return m_iconwin; }
+        FluxboxWindow *getFluxboxWin() { return m_fluxboxwin; }
+        const FluxboxWindow *getFluxboxWin() const { return m_fluxboxwin; }
+        unsigned int width() const;
+
 private:
-        Window m_iconwin;
         FluxboxWindow *m_fluxboxwin;
+        Window m_iconwin;
 };
 
-typedef LinkedList<IconBarObj> IconList;
-typedef LinkedListIterator<IconBarObj> IconListIterator;
-
+/**
+        Icon container
+*/
 class IconBar
 {
 public:
         IconBar(BScreen *scrn, Window parent);
         ~IconBar();
-        void draw();
+        void draw(); //TODO
         void reconfigure();
         Window addIcon(FluxboxWindow *fluxboxwin);
         Window delIcon(FluxboxWindow *fluxboxwin);
         void buttonPressEvent(XButtonEvent *be);        
         FluxboxWindow *findWindow(Window w);
+        IconBarObj *findIcon(FluxboxWindow *fluxboxwin);
         void exposeEvent(XExposeEvent *ee);
-private:
+
         void draw(IconBarObj *obj, int width);
+private:
+        typedef std::list<IconBarObj *> IconList;
+
+//      void draw(IconBarObj *obj, int width);
         void loadTheme(unsigned int width, unsigned int height);
         void decorate(Window win);
-        IconBarObj *findIcon(FluxboxWindow *fluxboxwin);
-        void repositionIcons(void);
+//      IconBarObj *findIcon(FluxboxWindow *fluxboxwin);
+        void repositionIcons();
         Window createIconWindow(FluxboxWindow *fluxboxwin, Window parent);
         BScreen *m_screen;
         Display *m_display;
         Window m_parent;
-        IconList *m_iconlist;   
+        IconList m_iconlist;    
         Pixmap m_focus_pm;
         unsigned long m_focus_pixel;
 };
 
-#endif // _ICONBAR_HH_
+#endif // ICONBAR_HH