6 files changed, 17 insertions, 19 deletions

diff --git a/src/FbTk/CompareEqual.hh b/src/FbTk/CompareEqual.hh
index 8f251e4..71c4bec 100644
--- a/src/FbTk/CompareEqual.hh
+++ b/src/FbTk/CompareEqual.hh
@@ -27,7 +27,7 @@ namespace FbTk {
 
 /// @brief compares one class function with a value type
 template <typename ClassType, typename ValueType>
-class CompareEqual_base: public std::unary_function<ClassType, bool> {
+class CompareEqual_base {
 public:
     typedef ValueType (ClassType::* Action)() const;
     typedef ValueType Value;
diff --git a/src/FbTk/Compose.hh b/src/FbTk/Compose.hh
index 04267e6..5bca2cb 100644
--- a/src/FbTk/Compose.hh
+++ b/src/FbTk/Compose.hh
@@ -29,16 +29,12 @@ namespace FbTk {
 /// Composes two functions into one.
 /// Uses Arg for type B and then calls type A
 template <class A, class B>
-class Compose_base: public std::unary_function<typename B::argument_type, typename A::result_type> {
+class Compose_base {
 public:
-    typedef typename A::result_type ResultTypeA;
-    typedef typename A::argument_type ArgumentTypeA;
-    typedef typename B::result_type ResultTypeB;
-    typedef typename B::argument_type ArgumentTypeB;
-
     Compose_base(const A &a, const B &b):m_a(a), m_b(b) { }
-    ResultTypeA operator () (const ArgumentTypeB &arg) const {
-        return m_a(m_b(arg));
+    template <class ARG>
+    auto operator () (const ARG& arg) const {
+      return m_a(m_b(arg));
     }
 
 private:
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)) ||
diff --git a/src/FbTk/Container.hh b/src/FbTk/Container.hh
index 2dc6475..1d3547a 100644
--- a/src/FbTk/Container.hh
+++ b/src/FbTk/Container.hh
@@ -90,7 +90,7 @@ public:
     unsigned int maxWidthPerClient() const;
     bool updateLock() const { return m_update_lock; }
 
-    void for_each(std::mem_fun_t<void, FbWindow> function);
+    void for_each(std::function<void(Item)> function);
     void setAlpha(int alpha); // set alpha on all windows
 
     ItemList::iterator begin() { return m_item_list.begin(); }
diff --git a/src/FbTk/MemFun.hh b/src/FbTk/MemFun.hh
index 73134d2..bb13d3f 100644
--- a/src/FbTk/MemFun.hh
+++ b/src/FbTk/MemFun.hh
@@ -56,7 +56,7 @@ MemFun( Object& obj, ReturnType (Object:: *action)() ) {
 
 /// One argument functor
 template <typename ReturnType, typename Object, typename Arg1>
-class MemFun1: public std::unary_function<Arg1, ReturnType> {
+class MemFun1 {
 public:
     typedef ReturnType (Object:: *Action)(Arg1);
 
@@ -83,7 +83,7 @@ MemFun( Object& obj, ReturnType (Object:: *action)(Arg1) ) {
 
 /// Two argument functor
 template <typename ReturnType, typename Object, typename Arg1, typename Arg2>
-class MemFun2: public std::binary_function<Arg1, Arg2, ReturnType> {
+class MemFun2 {
 public:
     typedef ReturnType (Object:: *Action)(Arg1,Arg2);
 
diff --git a/src/FbTk/Select2nd.hh b/src/FbTk/Select2nd.hh
index b0437b7..217c656 100644
--- a/src/FbTk/Select2nd.hh
+++ b/src/FbTk/Select2nd.hh
@@ -27,7 +27,7 @@
 namespace FbTk {
 
 template <class A>
-class Select2nd:public std::unary_function<A, typename A::second_type> {
+class Select2nd {
 public:
     typename A::second_type operator () (const A &arg) const {
         return arg.second;