From cb7ab28601901e3c7050fa17a6098f658206aaba Mon Sep 17 00:00:00 2001 From: fluxgen <fluxgen> Date: Mon, 13 Oct 2003 23:49:12 +0000 Subject: cleaning --- src/Toolbar.hh | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/Toolbar.hh b/src/Toolbar.hh index c85eb44..3fa042f 100644 --- a/src/Toolbar.hh +++ b/src/Toolbar.hh @@ -22,24 +22,23 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Toolbar.hh,v 1.47 2003/10/06 06:22:43 rathnor Exp $ +// $Id: Toolbar.hh,v 1.48 2003/10/13 23:49:12 fluxgen Exp $ #ifndef TOOLBAR_HH #define TOOLBAR_HH -#include "Timer.hh" #include "ToolbarTheme.hh" -#include "ToolTheme.hh" -#include "IconbarTheme.hh" - -#include "EventHandler.hh" -#include "FbWindow.hh" -#include "ArrowButton.hh" -#include "Observer.hh" -#include "XLayer.hh" -#include "XLayerItem.hh" #include "LayerMenu.hh" -#include "Resource.hh" +#include "ToolFactory.hh" +#include "ToolTheme.hh" + +#include "FbTk/Timer.hh" +#include "FbTk/Resource.hh" +#include "FbTk/Observer.hh" +#include "FbTk/XLayer.hh" +#include "FbTk/XLayerItem.hh" +#include "FbTk/EventHandler.hh" +#include "FbTk/FbWindow.hh" #include <memory> @@ -169,14 +168,13 @@ private: // themes ToolbarTheme m_theme; - ToolTheme m_clock_theme; - std::auto_ptr<ToolTheme> m_workspace_theme; - IconbarTheme m_iconbar_theme; - + FbTk::XLayerItem m_layeritem; typedef std::list<ToolbarItem *> ItemList; ItemList m_item_list; + ToolFactory m_tool_factory; + Strut *m_strut; ///< created and destroyed by BScreen // resources -- cgit v0.11.2