diff options
author | fluxgen <fluxgen> | 2002-02-04 22:43:15 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-02-04 22:43:15 (GMT) |
commit | 936e16583d66c1b2d6bf61a05daf3b1a6530f23b (patch) | |
tree | 05da6584e4680a6d3075b5bf5d92490907a6d04c /src/IconBar.hh | |
parent | cdc6210bfe53ca05eae93e48e52a1ffed3a9b610 (diff) | |
download | fluxbox-936e16583d66c1b2d6bf61a05daf3b1a6530f23b.zip fluxbox-936e16583d66c1b2d6bf61a05daf3b1a6530f23b.tar.bz2 |
replaced LinkedList with stl container and fixed multibyte
Diffstat (limited to 'src/IconBar.hh')
-rw-r--r-- | src/IconBar.hh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/IconBar.hh b/src/IconBar.hh index 7a8792b..06ea007 100644 --- a/src/IconBar.hh +++ b/src/IconBar.hh | |||
@@ -19,14 +19,15 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: IconBar.hh,v 1.4 2002/01/09 14:11:20 fluxgen Exp $ | 22 | // $Id: IconBar.hh,v 1.5 2002/02/04 22:43:15 fluxgen Exp $ |
23 | 23 | ||
24 | #ifndef _ICONBAR_HH_ | 24 | #ifndef _ICONBAR_HH_ |
25 | #define _ICONBAR_HH_ | 25 | #define _ICONBAR_HH_ |
26 | 26 | ||
27 | #include <vector> | 27 | #include <vector> |
28 | #include "Window.hh" | 28 | #include "Window.hh" |
29 | #include "LinkedList.hh" | 29 | |
30 | #include <list> | ||
30 | 31 | ||
31 | class IconBarObj | 32 | class IconBarObj |
32 | { | 33 | { |
@@ -57,8 +58,7 @@ public: | |||
57 | 58 | ||
58 | void draw(IconBarObj *obj, int width); | 59 | void draw(IconBarObj *obj, int width); |
59 | private: | 60 | private: |
60 | typedef LinkedList<IconBarObj> IconList; | 61 | typedef std::list<IconBarObj *> IconList; |
61 | typedef LinkedListIterator<IconBarObj> IconListIterator; | ||
62 | 62 | ||
63 | // void draw(IconBarObj *obj, int width); | 63 | // void draw(IconBarObj *obj, int width); |
64 | void loadTheme(unsigned int width, unsigned int height); | 64 | void loadTheme(unsigned int width, unsigned int height); |
@@ -69,7 +69,7 @@ private: | |||
69 | BScreen *m_screen; | 69 | BScreen *m_screen; |
70 | Display *m_display; | 70 | Display *m_display; |
71 | Window m_parent; | 71 | Window m_parent; |
72 | IconList *m_iconlist; | 72 | IconList m_iconlist; |
73 | Pixmap m_focus_pm; | 73 | Pixmap m_focus_pm; |
74 | unsigned long m_focus_pixel; | 74 | unsigned long m_focus_pixel; |
75 | }; | 75 | }; |