1 files changed, 8 insertions, 6 deletions

diff --git a/src/FbTk/Container.cc b/src/FbTk/Container.cc
index cea761b..713d36b 100644
--- a/src/FbTk/Container.cc
+++ b/src/FbTk/Container.cc
@@ -32,6 +32,8 @@
 #include <algorithm>
 #include <vector>
 
+using namespace std::placeholders;
+
 namespace FbTk {
 
 typedef CompareEqual_base<FbWindow, Window> CompareWindow;
@@ -491,27 +493,27 @@ unsigned int Container::maxWidthPerClient() const {
     return 1;
 }
 
-void Container::for_each(std::mem_fun_t<void, FbWindow> function) {
+void Container::for_each(std::function<void(Item)> function) {
     std::for_each(begin(), end(), function);
 }
 
 void Container::setAlpha(int alpha) {
     FbWindow::setAlpha(alpha);
-    STLUtil::forAll(m_item_list, std::bind2nd(std::mem_fun(&Button::setAlpha), alpha));
+    STLUtil::forAll(m_item_list, std::bind(std::mem_fn(&Button::setAlpha), _1, alpha));
 }
 
 void Container::parentMoved() {
     FbWindow::parentMoved();
-    STLUtil::forAll(m_item_list, std::mem_fun(&Button::parentMoved));
+    STLUtil::forAll(m_item_list, std::mem_fn(&Button::parentMoved));
 }
 
 void Container::invalidateBackground() {
     FbWindow::invalidateBackground();
-    STLUtil::forAll(m_item_list, std::mem_fun(&Button::invalidateBackground));
+    STLUtil::forAll(m_item_list, std::mem_fn(&Button::invalidateBackground));
 }
 
 void Container::clear() {
-    STLUtil::forAll(m_item_list, std::mem_fun(&Button::clear));
+    STLUtil::forAll(m_item_list, std::mem_fn(&Button::clear));
 }
 
 void Container::setOrientation(Orientation orient) {
@@ -519,7 +521,7 @@ void Container::setOrientation(Orientation orient) {
         return;
 
     FbWindow::invalidateBackground();
-    STLUtil::forAll(m_item_list, std::bind2nd(std::mem_fun(&Button::setOrientation), orient));
+    STLUtil::forAll(m_item_list, std::bind(std::mem_fn(&Button::setOrientation),_1, orient));
 
     if (((m_orientation == ROT0 || m_orientation == ROT180) &&
         (orient == ROT90 || orient == ROT270)) ||