Merge branch 'master' into to_push

1 files changed, 9 insertions, 9 deletions

diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index c295e24..100b38b 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -37,7 +37,6 @@
 
 #include "FbTk/Timer.hh"
 #include "FbTk/Resource.hh"
-#include "FbTk/Observer.hh"
 #include "FbTk/XLayer.hh"
 #include "FbTk/XLayerItem.hh"
 #include "FbTk/EventHandler.hh"
@@ -57,17 +56,18 @@ class Shape;
 
 /// The toolbar.
 /// Handles iconbar, workspace name view and clock view
-class Toolbar: public FbTk::EventHandler, public FbTk::Observer, public LayerObject {
+class Toolbar: public FbTk::EventHandler,
+               public LayerObject {
 public:
 
     /// Toolbar placement on the screen
-    enum Placement{
+    enum Placement {
         // top and bottom placement
-        TOPLEFT = 1, BOTTOMLEFT, TOPCENTER,
-        BOTTOMCENTER, TOPRIGHT, BOTTOMRIGHT,
+        TOPLEFT = 1, TOPCENTER, TOPRIGHT,
+        BOTTOMLEFT, BOTTOMCENTER, BOTTOMRIGHT,
         // left and right placement
-        LEFTCENTER, LEFTBOTTOM, LEFTTOP,
-        RIGHTCENTER, RIGHTBOTTOM, RIGHTTOP
+        LEFTBOTTOM, LEFTCENTER, LEFTTOP,
+        RIGHTBOTTOM, RIGHTCENTER, RIGHTTOP
     };
 
     /// Create a toolbar on the screen with specific width
@@ -99,8 +99,6 @@ public:
     void reconfigure();
     void setPlacement(Placement where);
 
-    void update(FbTk::Subject *subj);
-
     int layerNumber() const { return const_cast<FbTk::XLayerItem &>(m_layeritem).getLayerNum(); }
 
     const FbTk::Menu &menu() const { return m_toolbarmenu; }
@@ -193,6 +191,8 @@ private:
     StringList m_tools;
 
     bool m_resize_lock; ///< to lock rearrangeItems or not
+    /// observers for various signals
+    std::vector<FbTk::Observer*> m_observers;
 };