moved Container to FbTk

9 files changed, 101 insertions, 139 deletions

diff --git a/src/CompareWindow.hh b/src/CompareWindow.hh
deleted file mode 100644
index 48c1dfd..0000000
--- a/src/CompareWindow.hh
+++ /dev/null
@@ -1,34 +0,0 @@
-// CompareWindow.hh for Fluxbox - an X11 Window manager
-// Copyright (c) 2003 - 2006 Henrik Kinnunen (fluxgen at fluxbox dot org)
-//                and Simon Bowden (rathnor at users.sourceforge.net)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-// $Id$
-
-
-#ifndef COMPAREWINDOW_HH
-#define COMPAREWINDOW_HH
-
-#include "FbTk/CompareEqual.hh"
-#include "FbTk/FbWindow.hh"
-
-typedef FbTk::CompareEqual_base<FbTk::FbWindow, Window> CompareWindow;
-
-#endif // COMPAREWINDOW_HH
diff --git a/src/Container.cc b/src/FbTk/Container.cc
index e2d01c7..9da25c6 100644
--- a/src/Container.cc
+++ b/src/FbTk/Container.cc
@@ -20,24 +20,26 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id$
-
 #include "Container.hh"
 
-#include "FbTk/Button.hh"
-#include "FbTk/EventManager.hh"
-#include "CompareWindow.hh"
+#include "Button.hh"
+#include "EventManager.hh"
+#include "CompareEqual.hh"
 
 #include <algorithm>
 
-Container::Container(const FbTk::FbWindow &parent):
-    FbTk::FbWindow(parent, 0, 0, 1, 1, ExposureMask), 
-    m_orientation(FbTk::ROT0),
+namespace FbTk {
+
+typedef CompareEqual_base<FbWindow, Window> CompareWindow;
+
+Container::Container(const FbWindow &parent):
+    FbWindow(parent, 0, 0, 1, 1, ExposureMask),
+    m_orientation(ROT0),
     m_align(RELATIVE),
     m_max_size_per_client(60),
     m_max_total_size(0),
     m_update_lock(false) {
-    FbTk::EventManager::instance()->add(*this, *this);
+    EventManager::instance()->add(*this, *this);
 }
 
 Container::~Container() {
@@ -46,26 +48,21 @@ Container::~Container() {
 
 void Container::resize(unsigned int width, unsigned int height) {
     // do we need to resize?
-    if (FbTk::FbWindow::width() == width &&
-        FbTk::FbWindow::height() == height)
+    if (FbWindow::width() == width &&
+        FbWindow::height() == height)
         return;
 
-    FbTk::FbWindow::resize(width, height);
+    FbWindow::resize(width, height);
     repositionItems();
 }
 
 void Container::moveResize(int x, int y,
                            unsigned int width, unsigned int height) {
-    FbTk::FbWindow::moveResize(x, y, width, height);
+    FbWindow::moveResize(x, y, width, height);
     repositionItems();
 }
 
 #ifdef NOT_USED
-void Container::move(int x, int y) {
-    FbTk::FbWindow::move(x, y);
-    // no need to reposition
-}
-
 void Container::insertItems(ItemList &item_list, int pos) {
 
     // make sure all items have parent == this
@@ -136,11 +133,11 @@ void Container::moveItem(Item item, int movement) {
     if (newindex < 0) // neg wrap
         newindex += size;
 
-    ItemList::iterator it = std::find(m_item_list.begin(), 
-                                      m_item_list.end(), 
+    ItemList::iterator it = std::find(m_item_list.begin(),
+                                      m_item_list.end(),
                                       item);
     m_item_list.erase(it);
-    
+
     for (it = m_item_list.begin(); newindex >= 0; ++it, --newindex) {
         if (newindex == 0) {
             break;
@@ -177,7 +174,7 @@ bool Container::moveItemTo(Item item, int x, int y) {
 
     ItemList::iterator it = find_if(m_item_list.begin(),
                                     m_item_list.end(),
-                                    CompareWindow(&FbTk::FbWindow::window,
+                                    CompareWindow(&FbWindow::window,
                                                   itemwin));
     // not found :(
     if (it == m_item_list.end())
@@ -278,7 +275,7 @@ bool Container::tryExposeEvent(XExposeEvent &event) {
 
     ItemList::iterator it = find_if(m_item_list.begin(),
                                     m_item_list.end(),
-                                    CompareWindow(&FbTk::FbWindow::window,
+                                    CompareWindow(&FbWindow::window,
                                                   event.window));
     // not found :(
     if (it == m_item_list.end())
@@ -296,7 +293,7 @@ bool Container::tryButtonPressEvent(XButtonEvent &event) {
 
     ItemList::iterator it = find_if(m_item_list.begin(),
                                     m_item_list.end(),
-                                    CompareWindow(&FbTk::FbWindow::window,
+                                    CompareWindow(&FbWindow::window,
                                                   event.window));
     // not found :(
     if (it == m_item_list.end())
@@ -314,7 +311,7 @@ bool Container::tryButtonReleaseEvent(XButtonEvent &event) {
 
     ItemList::iterator it = find_if(m_item_list.begin(),
                                     m_item_list.end(),
-                                    CompareWindow(&FbTk::FbWindow::window,
+                                    CompareWindow(&FbWindow::window,
                                                   event.window));
     // not found :(
     if (it == m_item_list.end())
@@ -341,7 +338,7 @@ void Container::repositionItems() {
     unsigned int height;
 
     // unrotate
-    if (m_orientation == FbTk::ROT0 || m_orientation == FbTk::ROT180) {
+    if (m_orientation == ROT0 || m_orientation == ROT180) {
         total_width = cur_width = width();
         height = this->height();
     } else {
@@ -361,22 +358,21 @@ void Container::repositionItems() {
             } else
                 max_width_per_client = 1;
         }
-    
         if (total_width != cur_width) {
             // calling Container::resize here risks infinite loops
             unsigned int neww = total_width, newh = height;
             translateSize(m_orientation, neww, newh);
-            if (align == RIGHT && m_orientation != FbTk::ROT270 || align == LEFT && m_orientation == FbTk::ROT270) {
+            if (align == RIGHT && m_orientation != ROT270 || align == LEFT && m_orientation == ROT270) {
                 int deltax = 0;
                 int deltay = 0;
-                if (m_orientation == FbTk::ROT0 || m_orientation == FbTk::ROT180)
+                if (m_orientation == ROT0 || m_orientation == ROT180)
                     deltax = - (total_width - cur_width);
                 else
                     deltay = - (total_width - cur_width);
 
-                FbTk::FbWindow::moveResize(x() + deltax, y() + deltay, neww, newh);
+                FbWindow::moveResize(x() + deltax, y() + deltay, neww, newh);
             } else {
-                FbTk::FbWindow::resize(neww, newh);
+                FbWindow::resize(neww, newh);
             }
         }
     }
@@ -421,9 +417,9 @@ void Container::repositionItems() {
         tmpw = max_width_per_client + extra;
         tmph = height;
 
-        FbTk::translateCoords(m_orientation, tmpx, tmpy, total_width, height);
-        FbTk::translatePosition(m_orientation, tmpx, tmpy, tmpw, tmph, borderW);
-        FbTk::translateSize(m_orientation, tmpw, tmph);
+        translateCoords(m_orientation, tmpx, tmpy, total_width, height);
+        translatePosition(m_orientation, tmpx, tmpy, tmpw, tmph, borderW);
+        translateSize(m_orientation, tmpw, tmph);
 
         // resize each clients including border in size
         (*it)->moveResize(tmpx, tmpy,
@@ -462,14 +458,14 @@ unsigned int Container::maxWidthPerClient() const {
     return 1;
 }
 
-void Container::for_each(std::mem_fun_t<void, FbTk::FbWindow> function) {
+void Container::for_each(std::mem_fun_t<void, FbWindow> function) {
     std::for_each(m_item_list.begin(),
                   m_item_list.end(),
                   function);
 }
 
 void Container::setAlpha(unsigned char alpha) {
-    FbTk::FbWindow::setAlpha(alpha);
+    FbWindow::setAlpha(alpha);
     ItemList::iterator it = m_item_list.begin();
     ItemList::iterator it_end = m_item_list.end();
     for (; it != it_end; ++it)
@@ -477,7 +473,7 @@ void Container::setAlpha(unsigned char alpha) {
 }
 
 void Container::parentMoved() {
-    FbTk::FbWindow::parentMoved();
+    FbWindow::parentMoved();
     ItemList::iterator it = m_item_list.begin();
     ItemList::iterator it_end = m_item_list.end();
     for (; it != it_end; ++it)
@@ -485,7 +481,7 @@ void Container::parentMoved() {
 }
 
 void Container::invalidateBackground() {
-    FbTk::FbWindow::invalidateBackground();
+    FbWindow::invalidateBackground();
     ItemList::iterator it = m_item_list.begin();
     ItemList::iterator it_end = m_item_list.end();
     for (; it != it_end; ++it)
@@ -500,21 +496,21 @@ void Container::clear() {
 
 }
 
-void Container::setOrientation(FbTk::Orientation orient) {
+void Container::setOrientation(Orientation orient) {
     if (m_orientation == orient)
         return;
 
-    FbTk::FbWindow::invalidateBackground();
+    FbWindow::invalidateBackground();
 
     ItemList::iterator it = m_item_list.begin();
     ItemList::iterator it_end = m_item_list.end();
     for (; it != it_end; ++it)
         (*it)->setOrientation(orient);
 
-    if ((m_orientation == FbTk::ROT0 || m_orientation == FbTk::ROT180) &&
-        (orient == FbTk::ROT90 || orient == FbTk::ROT270) ||
-        (m_orientation == FbTk::ROT90 || m_orientation == FbTk::ROT270) &&
-        (orient == FbTk::ROT0 || orient == FbTk::ROT180)) {
+    if ((m_orientation == ROT0 || m_orientation == ROT180) &&
+        (orient == ROT90 || orient == ROT270) ||
+        (m_orientation == ROT90 || m_orientation == ROT270) &&
+        (orient == ROT0 || orient == ROT180)) {
         // flip width and height
         m_orientation = orient;
         resize(height(), width());
@@ -524,3 +520,5 @@ void Container::setOrientation(FbTk::Orientation orient) {
     }
 
 }
+
+}; // end namespace FbTk
diff --git a/src/Container.hh b/src/FbTk/Container.hh
index 69da43d..7fb1e32 100644
--- a/src/Container.hh
+++ b/src/FbTk/Container.hh
@@ -20,35 +20,33 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id$
+#ifndef FBTK_CONTAINER_HH
+#define FBTK_CONTAINER_HH
 
-#ifndef CONTAINER_HH
-#define CONTAINER_HH
+#include "FbWindow.hh"
+#include "EventHandler.hh"
+#include "NotCopyable.hh"
+#include "Text.hh" // for Orientation
 
-#include "FbTk/FbWindow.hh"
-#include "FbTk/EventHandler.hh"
-#include "FbTk/NotCopyable.hh"
-#include "FbTk/Text.hh" // for Orientation
+#include <list>
+#include <functional>
 
 namespace FbTk {
-    class Button;
-}
 
-#include <list>
-#include <functional>
+class Button;
 
-class Container:public FbTk::FbWindow, public FbTk::EventHandler, private FbTk::NotCopyable {
+class Container: public FbWindow, public EventHandler, private NotCopyable {
 public:
     // LEFT, RIGHT => fixed total width, fixed icon size
     // RELATIVE => fixed total width, relative/variable icon size
     enum Alignment { LEFT, RELATIVE, RIGHT };
-    typedef FbTk::Button * Item;
-    typedef const FbTk::Button * ConstItem;
+    typedef Button * Item;
+    typedef const Button * ConstItem;
     typedef std::list<Item> ItemList;
 
-    explicit Container(const FbTk::FbWindow &parent);
+    explicit Container(const FbWindow &parent);
     virtual ~Container();
-    
+
     // manipulators
 
     void resize(unsigned int width, unsigned int height);
@@ -68,7 +66,7 @@ public:
     void setMaxSizePerClient(unsigned int size);
     void setMaxTotalSize(unsigned int size);
     void setAlignment(Alignment a);
-    void setOrientation(FbTk::Orientation orient);
+    void setOrientation(Orientation orient);
 
     Item back() { return m_item_list.back(); }
 
@@ -89,13 +87,13 @@ public:
 
     /// accessors
     inline Alignment alignment() const { return m_align; }
-    inline FbTk::Orientation orientation() const { return m_orientation; }
+    inline Orientation orientation() const { return m_orientation; }
     inline int size() const { return m_item_list.size(); }
     inline bool empty() const { return m_item_list.empty(); }
     unsigned int maxWidthPerClient() const;
     inline bool updateLock() const { return m_update_lock; }
 
-    void for_each(std::mem_fun_t<void, FbTk::FbWindow> function);
+    void for_each(std::mem_fun_t<void, FbWindow> function);
     void setAlpha(unsigned char alpha); // set alpha on all windows
 
     ItemList::iterator begin() { return m_item_list.begin(); }
@@ -106,7 +104,7 @@ public:
 private:
     void repositionItems();
 
-    FbTk::Orientation m_orientation;
+    Orientation m_orientation;
 
     Alignment m_align;
     unsigned int m_max_size_per_client;
@@ -115,5 +113,6 @@ private:
     bool m_update_lock;
 };
 
-#endif // CONTAINER_HH
+}; // end namespace FbTk
 
+#endif // FBTK_CONTAINER_HH
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index 75733a7..b3dd277 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -36,6 +36,7 @@ libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \
         XFontImp.cc XFontImp.hh \
         Button.hh Button.cc \
         TextButton.hh TextButton.cc \
+        Container.hh Container.cc \
         Layer.hh LayerItem.hh MultLayers.cc MultLayers.hh \
         XLayer.cc XLayer.hh XLayerItem.cc XLayerItem.hh \
         Resource.hh Resource.cc \
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index 2c59798..7734497 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -29,12 +29,11 @@
 #include "FbTk/SimpleCommand.hh"
 #include "FbTk/Compose.hh"
 #include "FbTk/Transparent.hh"
-#include "CompareWindow.hh"
+#include "FbTk/CompareEqual.hh"
 #include "FbWinFrameTheme.hh"
 #include "Screen.hh"
 
 #include "IconButton.hh"
-#include "Container.hh"
 
 #ifdef SHAPE
 #include "Shape.hh"
@@ -150,7 +149,7 @@ bool FbWinFrame::setTabMode(TabMode tabmode) {
     } else {
         m_tab_container.setUpdateLock(true);
 
-        m_tab_container.setAlignment(Container::RELATIVE);
+        m_tab_container.setAlignment(FbTk::Container::RELATIVE);
         m_tab_container.setOrientation(FbTk::ROT0);
         if (m_tab_container.parent()->window() == m_screen.rootWindow().window()) {
             m_layeritem.removeWindow(m_tab_container);
@@ -336,7 +335,7 @@ void FbWinFrame::alignTabs() {
     case TOPLEFT:
         if (orig_orient != FbTk::ROT0) m_tab_container.hide();
         m_tab_container.setOrientation(FbTk::ROT0);
-        m_tab_container.setAlignment(Container::LEFT);
+        m_tab_container.setAlignment(FbTk::Container::LEFT);
         m_tab_container.setMaxTotalSize(m_window.width());
         tabx = x();
         taby = y() - yOffset();
@@ -344,7 +343,7 @@ void FbWinFrame::alignTabs() {
     case TOPRIGHT:
         if (orig_orient != FbTk::ROT0) m_tab_container.hide();
         m_tab_container.setOrientation(FbTk::ROT0);
-        m_tab_container.setAlignment(Container::RIGHT);
+        m_tab_container.setAlignment(FbTk::Container::RIGHT);
         m_tab_container.setMaxTotalSize(m_window.width());
         tabx = x() + width() - m_tab_container.width();
         taby = y() - yOffset();
@@ -352,7 +351,7 @@ void FbWinFrame::alignTabs() {
     case LEFTTOP:
         if (orig_orient != FbTk::ROT270) m_tab_container.hide();
         m_tab_container.setOrientation(FbTk::ROT270);
-        m_tab_container.setAlignment(Container::RIGHT);
+        m_tab_container.setAlignment(FbTk::Container::RIGHT);
         m_tab_container.setMaxTotalSize(m_window.height());
         tabx = x() - xOffset();
         taby = y();
@@ -360,7 +359,7 @@ void FbWinFrame::alignTabs() {
     case LEFTBOTTOM:
         if (orig_orient != FbTk::ROT270) m_tab_container.hide();
         m_tab_container.setOrientation(FbTk::ROT270);
-        m_tab_container.setAlignment(Container::LEFT);
+        m_tab_container.setAlignment(FbTk::Container::LEFT);
         m_tab_container.setMaxTotalSize(m_window.height());
         tabx = x() - xOffset();
         taby = y() + height() - m_tab_container.height();
@@ -368,7 +367,7 @@ void FbWinFrame::alignTabs() {
     case RIGHTTOP:
         if (orig_orient != FbTk::ROT90) m_tab_container.hide();
         m_tab_container.setOrientation(FbTk::ROT90);
-        m_tab_container.setAlignment(Container::LEFT);
+        m_tab_container.setAlignment(FbTk::Container::LEFT);
         m_tab_container.setMaxTotalSize(m_window.height());
         tabx = x() + width() + m_window.borderWidth();
         taby = y();
@@ -376,7 +375,7 @@ void FbWinFrame::alignTabs() {
     case RIGHTBOTTOM:
         if (orig_orient != FbTk::ROT90) m_tab_container.hide();
         m_tab_container.setOrientation(FbTk::ROT90);
-        m_tab_container.setAlignment(Container::RIGHT);
+        m_tab_container.setAlignment(FbTk::Container::RIGHT);
         m_tab_container.setMaxTotalSize(m_window.height());
         tabx = x() + width() + m_window.borderWidth();
         taby = y() + height() - m_tab_container.height();
@@ -384,7 +383,7 @@ void FbWinFrame::alignTabs() {
     case BOTTOMLEFT:
         if (orig_orient != FbTk::ROT0) m_tab_container.hide();
         m_tab_container.setOrientation(FbTk::ROT0);
-        m_tab_container.setAlignment(Container::LEFT);
+        m_tab_container.setAlignment(FbTk::Container::LEFT);
         m_tab_container.setMaxTotalSize(m_window.width());
         tabx = x();
         taby = y() + height() + m_window.borderWidth();
@@ -392,7 +391,7 @@ void FbWinFrame::alignTabs() {
     case BOTTOMRIGHT:
         if (orig_orient != FbTk::ROT0) m_tab_container.hide();
         m_tab_container.setOrientation(FbTk::ROT0);
-        m_tab_container.setAlignment(Container::RIGHT);
+        m_tab_container.setAlignment(FbTk::Container::RIGHT);
         m_tab_container.setMaxTotalSize(m_window.width());
         tabx = x() + width() - m_tab_container.width();
         taby = y() + height() + m_window.borderWidth();
@@ -1453,8 +1452,8 @@ void FbWinFrame::applyTabContainer() {
         m_tab_container.setBackgroundColor(*tabcontainer_color);
 
     // and the labelbuttons in it
-    Container::ItemList::iterator btn_it = m_tab_container.begin();
-    Container::ItemList::iterator btn_it_end = m_tab_container.end();
+    FbTk::Container::ItemList::iterator btn_it = m_tab_container.begin();
+    FbTk::Container::ItemList::iterator btn_it_end = m_tab_container.end();
     for (; btn_it != btn_it_end; ++btn_it) {
         IconButton *btn = static_cast<IconButton *>(*btn_it);
         btn->reconfigTheme();
diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh
index 7b561ee..69ff020 100644
--- a/src/FbWinFrame.hh
+++ b/src/FbWinFrame.hh
@@ -33,7 +33,7 @@
 #include "FbTk/XLayerItem.hh"
 #include "FbTk/TextButton.hh"
 #include "FbTk/DefaultValue.hh"
-#include "Container.hh"
+#include "FbTk/Container.hh"
 #include "Shape.hh"
 
 #include <vector>
@@ -246,8 +246,8 @@ public:
     inline const FbTk::FbWindow &label() const { return m_label; }
     inline FbTk::FbWindow &label() { return m_label; }
 
-    inline const Container &tabcontainer() const { return m_tab_container; }
-    inline Container &tabcontainer() { return m_tab_container; }
+    inline const FbTk::Container &tabcontainer() const { return m_tab_container; }
+    inline FbTk::Container &tabcontainer() { return m_tab_container; }
     
     /// @return clientarea window
     inline const FbTk::FbWindow &clientArea() const { return m_clientarea; }
@@ -332,7 +332,7 @@ private:
     FbTk::XLayerItem m_layeritem;
 
     FbTk::FbWindow m_titlebar; ///<  titlebar window
-    Container      m_tab_container; ///< Holds tabs
+    FbTk::Container m_tab_container; ///< Holds tabs
     FbTk::TextButton m_label; ///< holds title
     FbTk::FbWindow m_handle; ///< handle between grips
     FbTk::FbWindow m_grip_right,  ///< rightgrip
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index 294754c..de56569 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -69,31 +69,31 @@ using std::endl;
 namespace FbTk {
 
 template<>
-void FbTk::Resource<Container::Alignment>::setDefaultValue() {
-    m_value = Container::RELATIVE;
+void FbTk::Resource<FbTk::Container::Alignment>::setDefaultValue() {
+    m_value = FbTk::Container::RELATIVE;
 }
 
 template<>
-string FbTk::Resource<Container::Alignment>::getString() const {
+string FbTk::Resource<FbTk::Container::Alignment>::getString() const {
     switch (m_value) {
-    case Container::LEFT:
+    case FbTk::Container::LEFT:
         return string("Left");
-    case Container::RIGHT:
+    case FbTk::Container::RIGHT:
         return string("Right");
-    case Container::RELATIVE:
+    case FbTk::Container::RELATIVE:
         return string("Relative");
     }
     return string("Left");
 }
 
 template<>
-void FbTk::Resource<Container::Alignment>::setFromString(const char *str) {
+void FbTk::Resource<FbTk::Container::Alignment>::setFromString(const char *str) {
     if (strcasecmp(str, "Left") == 0)
-        m_value = Container::LEFT;
+        m_value = FbTk::Container::LEFT;
     else if (strcasecmp(str, "Right") == 0)
-        m_value = Container::RIGHT;
+        m_value = FbTk::Container::RIGHT;
     else if (strcasecmp(str, "Relative") == 0)
-        m_value = Container::RELATIVE;
+        m_value = FbTk::Container::RELATIVE;
     else
         setDefaultValue();
 }
@@ -124,7 +124,7 @@ private:
 class ToolbarAlignMenuItem: public FbTk::MenuItem {
 public:
     ToolbarAlignMenuItem(const FbTk::FbString &label, IconbarTool &handler,
-                        Container::Alignment mode,
+                        FbTk::Container::Alignment mode,
                         FbTk::RefCount<FbTk::Command> &cmd):
         FbTk::MenuItem(label, cmd), m_handler(handler), m_mode(mode) {
         setCloseOnClick(false);
@@ -137,7 +137,7 @@ public:
 
 private:
     IconbarTool &m_handler;
-    Container::Alignment m_mode;
+    FbTk::Container::Alignment m_mode;
 };
 
 void setupModeMenu(FbTk::Menu &menu, IconbarTool &handler) {
@@ -194,17 +194,17 @@ void setupModeMenu(FbTk::Menu &menu, IconbarTool &handler) {
     menu.insert(new ToolbarAlignMenuItem(
                     _FB_XTEXT(Align, Left, "Left", "Align to the left"),
                     handler,
-                    Container::LEFT, saverc_cmd));
+                    FbTk::Container::LEFT, saverc_cmd));
 
     menu.insert(new ToolbarAlignMenuItem(
                     _FB_XTEXT(Align, Relative, "Relative", "Align relative to the width"),
                     handler,
-                    Container::RELATIVE, saverc_cmd));
+                    FbTk::Container::RELATIVE, saverc_cmd));
 
     menu.insert(new ToolbarAlignMenuItem(
                     _FB_XTEXT(Align, Right, "Right", "Align to the right"),
                     handler,
-                    Container::RIGHT, saverc_cmd));
+                    FbTk::Container::RIGHT, saverc_cmd));
 
     menu.insert(new FbTk::MenuSeparator());
 
@@ -266,7 +266,7 @@ IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme,
     m_mode("none"),
     m_rc_mode(screen.resourceManager(), "{static groups} (workspace)",
               screen.name() + ".iconbar.mode", screen.altName() + ".Iconbar.Mode"),
-    m_rc_alignment(screen.resourceManager(), Container::LEFT,
+    m_rc_alignment(screen.resourceManager(), FbTk::Container::LEFT,
                    screen.name() + ".iconbar.alignment", screen.altName() + ".Iconbar.Alignment"),
     m_rc_client_width(screen.resourceManager(), 70,
                    screen.name() + ".iconbar.iconWidth", screen.altName() + ".Iconbar.IconWidth"),
@@ -331,7 +331,7 @@ void IconbarTool::hide() {
     m_icon_container.hide();
 }
 
-void IconbarTool::setAlignment(Container::Alignment align) {
+void IconbarTool::setAlignment(FbTk::Container::Alignment align) {
     *m_rc_alignment = align;
     update(0);
     m_menu.reconfigure();
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 @@
 #define ICONBARTOOL_HH
 
 #include "ToolbarItem.hh"
-#include "Container.hh"
 #include "FbMenu.hh"
 #include "FocusableList.hh"
 
+#include "FbTk/Container.hh"
 #include "FbTk/CachedPixmap.hh"
 #include "FbTk/Observer.hh"
 #include "FbTk/Resource.hh"
@@ -60,7 +60,7 @@ public:
     void update(FbTk::Subject *subj);
     void show();
     void hide();
-    void setAlignment(Container::Alignment a);
+    void setAlignment(FbTk::Container::Alignment a);
     void setMode(std::string mode);
     void parentMoved() { m_icon_container.parentMoved(); }
 
@@ -71,7 +71,7 @@ public:
     std::string mode() const { return *m_rc_mode; }
 
     void setOrientation(FbTk::Orientation orient);
-    Container::Alignment alignment() const { return m_icon_container.alignment(); }
+    FbTk::Container::Alignment alignment() const { return m_icon_container.alignment(); }
 
     const BScreen &screen() const { return m_screen; }
 private:
@@ -99,7 +99,7 @@ private:
     void updateList();
 
     BScreen &m_screen;
-    Container m_icon_container;
+    FbTk::Container m_icon_container;
     IconbarTheme &m_theme;
     FbTk::CachedPixmap m_empty_pm; ///< pixmap for empty container
 
@@ -108,7 +108,7 @@ private:
     IconMap m_icons;
     std::string m_mode;
     FbTk::Resource<std::string> m_rc_mode;
-    FbTk::Resource<Container::Alignment> m_rc_alignment; ///< alignment of buttons
+    FbTk::Resource<FbTk::Container::Alignment> m_rc_alignment; ///< alignment of buttons
     FbTk::Resource<int> m_rc_client_width; ///< size of client button in LEFT/RIGHT mode
     FbTk::Resource<unsigned int> m_rc_client_padding; ///< padding of the text
     FbTk::Resource<bool> m_rc_use_pixmap; ///< if iconbar should use win pixmap or not
diff --git a/src/Makefile.am b/src/Makefile.am
index 6b29c1a..d7ed54d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -119,7 +119,6 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
         WorkspaceCmd.hh WorkspaceCmd.cc \
         Shape.hh Shape.cc \
         MenuTheme.hh MenuTheme.cc \
-        Container.hh Container.cc \
         CommandDialog.hh CommandDialog.cc SendToMenu.hh SendToMenu.cc \
         AlphaMenu.hh AlphaMenu.cc ObjectResource.hh \
         CompareWindow.hh \