aboutsummaryrefslogtreecommitdiff
path: root/src/IconbarTool.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/IconbarTool.cc')
-rw-r--r--src/IconbarTool.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index 027ab1c..f88c91c 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -60,6 +60,8 @@ using std::string;
60using std::list; 60using std::list;
61using std::endl; 61using std::endl;
62 62
63using namespace std::placeholders;
64
63namespace FbTk { 65namespace FbTk {
64 66
65template<> 67template<>
@@ -367,13 +369,13 @@ void IconbarTool::setMode(string mode) {
367 mode + " (iconhidden=no)")); 369 mode + " (iconhidden=no)"));
368 if (m_winlist.get()) { 370 if (m_winlist.get()) {
369 m_winlist->addSig().connect( 371 m_winlist->addSig().connect(
370 std::bind1st(FbTk::MemFun(*this, &IconbarTool::update), LIST_ADD) 372 std::bind(FbTk::MemFun(*this, &IconbarTool::update), LIST_ADD, _1)
371 ); 373 );
372 m_winlist->removeSig().connect( 374 m_winlist->removeSig().connect(
373 std::bind1st(FbTk::MemFun(*this, &IconbarTool::update), LIST_REMOVE) 375 std::bind(FbTk::MemFun(*this, &IconbarTool::update), LIST_REMOVE, _1)
374 ); 376 );
375 m_winlist->addSig().connect( 377 m_winlist->addSig().connect(
376 std::bind1st(FbTk::MemFun(*this, &IconbarTool::update), LIST_ORDER) 378 std::bind(FbTk::MemFun(*this, &IconbarTool::update), LIST_ORDER, _1)
377 ); 379 );
378 m_winlist->resetSig().connect(FbTk::MemFunBind( 380 m_winlist->resetSig().connect(FbTk::MemFunBind(
379 *this, &IconbarTool::update, LIST_RESET, static_cast<Focusable *>(0) 381 *this, &IconbarTool::update, LIST_RESET, static_cast<Focusable *>(0)
@@ -518,7 +520,7 @@ void IconbarTool::updateSizing() {
518 m_icon_container.setBorderColor(m_theme.border().color()); 520 m_icon_container.setBorderColor(m_theme.border().color());
519 521
520 FbTk::STLUtil::forAll(m_icons, 522 FbTk::STLUtil::forAll(m_icons,
521 FbTk::Compose(std::mem_fun(&IconButton::reconfigTheme), 523 FbTk::Compose(std::mem_fn(&IconButton::reconfigTheme),
522 FbTk::Select2nd<IconMap::value_type>())); 524 FbTk::Select2nd<IconMap::value_type>()));
523 525
524} 526}