diff options
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r-- | src/Toolbar.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc index aa9bc12..d91626b 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.cc | |||
@@ -72,6 +72,8 @@ using std::list; | |||
72 | 72 | ||
73 | using FbTk::STLUtil::forAll; | 73 | using FbTk::STLUtil::forAll; |
74 | 74 | ||
75 | using namespace std::placeholders; | ||
76 | |||
75 | namespace { | 77 | namespace { |
76 | 78 | ||
77 | const struct { | 79 | const struct { |
@@ -366,9 +368,9 @@ void Toolbar::screenChanged(BScreen &screen) { | |||
366 | } | 368 | } |
367 | 369 | ||
368 | void Toolbar::relayout() { | 370 | void Toolbar::relayout() { |
369 | forAll(m_item_list, std::mem_fun(&ToolbarItem::updateSizing)); | 371 | forAll(m_item_list, std::mem_fn(&ToolbarItem::updateSizing)); |
370 | rearrangeItems(); | 372 | rearrangeItems(); |
371 | forAll(m_item_list, std::bind2nd(std::mem_fun(&ToolbarItem::renderTheme), alpha())); | 373 | forAll(m_item_list, std::bind(std::mem_fn(&ToolbarItem::renderTheme), _1, alpha())); |
372 | } | 374 | } |
373 | 375 | ||
374 | void Toolbar::reconfigure() { | 376 | void Toolbar::reconfigure() { |
@@ -734,7 +736,7 @@ void Toolbar::setPlacement(Toolbar::Placement where) { | |||
734 | break; | 736 | break; |
735 | } | 737 | } |
736 | 738 | ||
737 | forAll(m_item_list, std::bind2nd(std::mem_fun(&ToolbarItem::setOrientation), orient)); | 739 | forAll(m_item_list, std::bind(std::mem_fn(&ToolbarItem::setOrientation), _1, orient)); |
738 | } | 740 | } |
739 | 741 | ||
740 | void Toolbar::updateVisibleState() { | 742 | void Toolbar::updateVisibleState() { |
@@ -749,7 +751,7 @@ void Toolbar::toggleHidden() { | |||
749 | frame.window.move(frame.x_hidden, frame.y_hidden); | 751 | frame.window.move(frame.x_hidden, frame.y_hidden); |
750 | else { | 752 | else { |
751 | frame.window.move(frame.x, frame.y); | 753 | frame.window.move(frame.x, frame.y); |
752 | forAll(m_item_list, std::mem_fun(&ToolbarItem::parentMoved)); | 754 | forAll(m_item_list, std::mem_fn(&ToolbarItem::parentMoved)); |
753 | } | 755 | } |
754 | 756 | ||
755 | } | 757 | } |