1 files changed, 15 insertions, 11 deletions

diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index d6e19db..adbe7e3 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -19,18 +19,21 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef   _TOOLBAR_HH_
-#define   _TOOLBAR_HH_
-
-#include <X11/Xlib.h>
-
-
+// $Id: Toolbar.hh,v 1.7 2002/02/17 18:49:02 fluxgen Exp $
 
+#ifndef   TOOLBAR_HH
+#define   TOOLBAR_HH
 
+#include <X11/Xlib.h>
+#ifndef _BASEMENU_HH_
 #include "Basemenu.hh"
-#include "LinkedList.hh"
+#endif
+#ifndef _TIMER_HH_
 #include "Timer.hh"
+#endif
+#ifndef _ICONBAR_HH_
 #include "IconBar.hh"
+#endif
 
 
 // forward declaration
@@ -94,13 +97,13 @@ private:
   } hide_handler;
 
   Fluxbox *fluxbox;
-  BImageControl *image_ctrl;
   BScreen *screen;
+  BImageControl *image_ctrl; 
   BTimer *clock_timer, *hide_timer;
   Toolbarmenu *toolbarmenu;
         class IconBar *iconbar;
         
-  char *new_workspace_name, *new_name_pos;
+  std::string new_workspace_name;
 
   friend class HideHandler;
   friend class Toolbarmenu;
@@ -130,6 +133,7 @@ public:
   { return ((hidden) ? frame.x_hidden : frame.x); }
   inline const int &getY(void) const
   { return ((hidden) ? frame.y_hidden : frame.y); }
+        inline IconBar *getIconBar(void) { return iconbar; }
 
   void buttonPressEvent(XButtonEvent *);
   void buttonReleaseEvent(XButtonEvent *);
@@ -155,8 +159,8 @@ public:
 
   virtual void timeout(void);
 
-  enum { TopLeft = 1, BottomLeft, TopCenter,
-         BottomCenter, TopRight, BottomRight };
+  enum Placement{ TOPLEFT = 1, BOTTOMLEFT, TOPCENTER,
+         BOTTOMCENTER, TOPRIGHT, BOTTOMRIGHT };
 };