1 files changed, 8 insertions, 32 deletions

diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index f18afad..0073ab0 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.hh,v 1.40 2003/08/11 15:54:24 fluxgen Exp $
+// $Id: Toolbar.hh,v 1.41 2003/08/11 20:22:38 fluxgen Exp $
 
 #ifndef  TOOLBAR_HH
 #define  TOOLBAR_HH
@@ -30,6 +30,7 @@
 #include "Timer.hh"
 #include "ToolbarTheme.hh"
 #include "ToolTheme.hh"
+#include "IconbarTheme.hh"
 
 #include "EventHandler.hh"
 #include "FbWindow.hh"
@@ -74,22 +75,10 @@ public:
 
     virtual ~Toolbar();
 
-    /// add icon to iconbar
-    void addIcon(FluxboxWindow *w);
-    /// remove icon from iconbar
-    void delIcon(FluxboxWindow *w);
-    bool containsIcon(const FluxboxWindow &win) const;
-    /// remove all icons
-    void delAllIcons(bool ignore_stuck = false);
-    void enableIconBar();
-    void disableIconBar();
     void raise();
     void lower();
     void toggleHidden();
 
-    void enableUpdates();
-    void disableUpdates();
-
 
     void moveToLayer(int layernum);
 
@@ -107,13 +96,10 @@ public:
     void keyPressEvent(XKeyEvent &ke);
     //@}
         
-    void redrawWindowLabel(bool redraw= false);
-    void redrawWorkspaceLabel(bool redraw= false);
     /// enter edit mode on workspace label
     void edit();
     void reconfigure();
     void setPlacement(Placement where);
-    void checkClock(bool redraw = false, bool date = false);
 
     void update(FbTk::Subject *subj);
 
@@ -137,14 +123,13 @@ public:
     inline const FbTk::FbWindow &window() const { return frame.window; }
     inline BScreen &screen() { return m_screen; }
     inline const BScreen &screen() const { return m_screen; }
-    inline unsigned int width() const { return frame.width; }
-    inline unsigned int height() const { return frame.height; }
+    inline unsigned int width() const { return frame.window.width(); }
+    inline unsigned int height() const { return frame.window.height(); }
     inline unsigned int exposedHeight() const { return doAutoHide() ? frame.bevel_w : frame.height; }
     inline int x() const { return isHidden() ? frame.x_hidden : frame.x; }
     inline int y() const { return isHidden() ? frame.y_hidden : frame.y; }
     inline Placement placement() const { return *m_rc_placement; }
     /// @return pointer to iconbar if it got one, else 0
-    inline const IconBar *iconBar()  const { return m_iconbar.get(); }
     inline const ToolbarTheme &theme() const { return m_theme; }
     inline ToolbarTheme &theme() { return m_theme; }
     bool isVertical() const;
@@ -165,16 +150,12 @@ private:
         Frame(FbTk::EventHandler &evh, int screen_num);
         ~Frame();
 
-        Pixmap base, label;
-        FbTk::FbWindow window, window_label;
+        FbTk::FbWindow window;
 
         int x, y, x_hidden, y_hidden, grab_x, grab_y;
-        unsigned int width, height, window_label_w, bevel_w, label_h;
+        unsigned int width, height, bevel_w;
     } frame;
 
-    Pixmap m_icon_focused_pm, m_icon_unfocused_pm;
-    FbTk::Color m_icon_focused_color, m_icon_unfocused_color;
-
     BScreen &m_screen; ///< screen connection
 
     FbTk::Timer m_hide_timer; ///< timer to for auto hide toolbar
@@ -182,13 +163,7 @@ private:
     FbTk::Menu m_placementmenu;
     LayerMenu<Toolbar> m_layermenu;
 
-    // icon stuff
-    std::auto_ptr<Container> m_iconbar;
-    typedef std::map<FluxboxWindow *, IconButton *> Icon2WinMap;
-    Icon2WinMap m_icon2winmap;
         
-    std::string m_new_workspace_name; ///< temp variable in edit workspace name mode
-
     ToolbarTheme m_theme;
 
     FbTk::XLayerItem m_layeritem;
@@ -204,7 +179,8 @@ private:
     FbTk::Resource<Placement> m_rc_placement;
     std::auto_ptr<Shape> m_shape;
 
-    ToolTheme m_tool_theme;
+    ToolTheme m_clock_theme, m_workspace_theme;
+    IconbarTheme m_iconbar_theme;
 
 };