Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 3 insertions, 2 deletions

diff --git a/src/FbTk/Container.hh b/src/FbTk/Container.hh
index 00f2c88..bd5e3aa 100644
--- a/src/FbTk/Container.hh
+++ b/src/FbTk/Container.hh
@@ -29,6 +29,7 @@
 #include "Orientation.hh"
 
 #include <list>
+#include <functional>
 
 namespace FbTk {
 
@@ -43,7 +44,7 @@ public:
     typedef const Button * ConstItem;
     typedef std::list<Item> ItemList;
 
-    explicit Container(const FbWindow &parent);
+    explicit Container(const FbWindow &parent, bool auto_resize = true);
     virtual ~Container();
 
     // manipulators
@@ -106,7 +107,7 @@ private:
     unsigned int m_max_size_per_client;
     unsigned int m_max_total_size;
     ItemList m_item_list;
-    bool m_update_lock;
+    bool m_update_lock, m_auto_resize;
 };
 
 } // end namespace FbTk