aboutsummaryrefslogtreecommitdiff
path: root/src/IconbarTool.hh
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2007-12-28 05:47:55 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2007-12-28 05:47:55 (GMT)
commite8a2f155e8d5a082a8c04f291e65c137c20a05cb (patch)
tree4107154a6c73d518b604aab43371c994ae172624 /src/IconbarTool.hh
parent00ceefd8846bda6f4dc43a5a990086545ea28727 (diff)
downloadfluxbox-e8a2f155e8d5a082a8c04f291e65c137c20a05cb.zip
fluxbox-e8a2f155e8d5a082a8c04f291e65c137c20a05cb.tar.bz2
moved Container to FbTk
Diffstat (limited to 'src/IconbarTool.hh')
-rw-r--r--src/IconbarTool.hh10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/IconbarTool.hh b/src/IconbarTool.hh
index e1bebe3..3111875 100644
--- a/src/IconbarTool.hh
+++ b/src/IconbarTool.hh
@@ -26,10 +26,10 @@
26#define ICONBARTOOL_HH 26#define ICONBARTOOL_HH
27 27
28#include "ToolbarItem.hh" 28#include "ToolbarItem.hh"
29#include "Container.hh"
30#include "FbMenu.hh" 29#include "FbMenu.hh"
31#include "FocusableList.hh" 30#include "FocusableList.hh"
32 31
32#include "FbTk/Container.hh"
33#include "FbTk/CachedPixmap.hh" 33#include "FbTk/CachedPixmap.hh"
34#include "FbTk/Observer.hh" 34#include "FbTk/Observer.hh"
35#include "FbTk/Resource.hh" 35#include "FbTk/Resource.hh"
@@ -60,7 +60,7 @@ public:
60 void update(FbTk::Subject *subj); 60 void update(FbTk::Subject *subj);
61 void show(); 61 void show();
62 void hide(); 62 void hide();
63 void setAlignment(Container::Alignment a); 63 void setAlignment(FbTk::Container::Alignment a);
64 void setMode(std::string mode); 64 void setMode(std::string mode);
65 void parentMoved() { m_icon_container.parentMoved(); } 65 void parentMoved() { m_icon_container.parentMoved(); }
66 66
@@ -71,7 +71,7 @@ public:
71 std::string mode() const { return *m_rc_mode; } 71 std::string mode() const { return *m_rc_mode; }
72 72
73 void setOrientation(FbTk::Orientation orient); 73 void setOrientation(FbTk::Orientation orient);
74 Container::Alignment alignment() const { return m_icon_container.alignment(); } 74 FbTk::Container::Alignment alignment() const { return m_icon_container.alignment(); }
75 75
76 const BScreen &screen() const { return m_screen; } 76 const BScreen &screen() const { return m_screen; }
77private: 77private:
@@ -99,7 +99,7 @@ private:
99 void updateList(); 99 void updateList();
100 100
101 BScreen &m_screen; 101 BScreen &m_screen;
102 Container m_icon_container; 102 FbTk::Container m_icon_container;
103 IconbarTheme &m_theme; 103 IconbarTheme &m_theme;
104 FbTk::CachedPixmap m_empty_pm; ///< pixmap for empty container 104 FbTk::CachedPixmap m_empty_pm; ///< pixmap for empty container
105 105
@@ -108,7 +108,7 @@ private:
108 IconMap m_icons; 108 IconMap m_icons;
109 std::string m_mode; 109 std::string m_mode;
110 FbTk::Resource<std::string> m_rc_mode; 110 FbTk::Resource<std::string> m_rc_mode;
111 FbTk::Resource<Container::Alignment> m_rc_alignment; ///< alignment of buttons 111 FbTk::Resource<FbTk::Container::Alignment> m_rc_alignment; ///< alignment of buttons
112 FbTk::Resource<int> m_rc_client_width; ///< size of client button in LEFT/RIGHT mode 112 FbTk::Resource<int> m_rc_client_width; ///< size of client button in LEFT/RIGHT mode
113 FbTk::Resource<unsigned int> m_rc_client_padding; ///< padding of the text 113 FbTk::Resource<unsigned int> m_rc_client_padding; ///< padding of the text
114 FbTk::Resource<bool> m_rc_use_pixmap; ///< if iconbar should use win pixmap or not 114 FbTk::Resource<bool> m_rc_use_pixmap; ///< if iconbar should use win pixmap or not