summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Toolbar.hh30
1 files 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 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.hh,v 1.47 2003/10/06 06:22:43 rathnor Exp $ 25// $Id: Toolbar.hh,v 1.48 2003/10/13 23:49:12 fluxgen Exp $
26 26
27#ifndef TOOLBAR_HH 27#ifndef TOOLBAR_HH
28#define TOOLBAR_HH 28#define TOOLBAR_HH
29 29
30#include "Timer.hh"
31#include "ToolbarTheme.hh" 30#include "ToolbarTheme.hh"
32#include "ToolTheme.hh"
33#include "IconbarTheme.hh"
34
35#include "EventHandler.hh"
36#include "FbWindow.hh"
37#include "ArrowButton.hh"
38#include "Observer.hh"
39#include "XLayer.hh"
40#include "XLayerItem.hh"
41#include "LayerMenu.hh" 31#include "LayerMenu.hh"
42#include "Resource.hh" 32#include "ToolFactory.hh"
33#include "ToolTheme.hh"
34
35#include "FbTk/Timer.hh"
36#include "FbTk/Resource.hh"
37#include "FbTk/Observer.hh"
38#include "FbTk/XLayer.hh"
39#include "FbTk/XLayerItem.hh"
40#include "FbTk/EventHandler.hh"
41#include "FbTk/FbWindow.hh"
43 42
44#include <memory> 43#include <memory>
45 44
@@ -169,14 +168,13 @@ private:
169 168
170 // themes 169 // themes
171 ToolbarTheme m_theme; 170 ToolbarTheme m_theme;
172 ToolTheme m_clock_theme; 171
173 std::auto_ptr<ToolTheme> m_workspace_theme;
174 IconbarTheme m_iconbar_theme;
175
176 FbTk::XLayerItem m_layeritem; 172 FbTk::XLayerItem m_layeritem;
177 typedef std::list<ToolbarItem *> ItemList; 173 typedef std::list<ToolbarItem *> ItemList;
178 ItemList m_item_list; 174 ItemList m_item_list;
179 175
176 ToolFactory m_tool_factory;
177
180 Strut *m_strut; ///< created and destroyed by BScreen 178 Strut *m_strut; ///< created and destroyed by BScreen
181 179
182 // resources 180 // resources