X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fhub.cpp;h=b28882f6aad8733944f9002d4abfe6c308c1088f;hb=8d0f0839d1fc5195fce1b77c36e7f3b5b114e696;hp=4a2d5533aafeb36bea172bee347e0bd4d25ae184;hpb=b2d45380967cb2f682c3edfa6288b3d412507d5d;p=libs%2Fgui.git

diff --git a/source/input/hub.cpp b/source/input/hub.cpp
index 4a2d553..b28882f 100644
--- a/source/input/hub.cpp
+++ b/source/input/hub.cpp
@@ -1,5 +1,6 @@
 #include <stdexcept>
 #include <sigc++/bind.h>
+#include <sigc++/bind_return.h>
 #include <msp/core/hash.h>
 #include <msp/core/maputils.h>
 #include "hub.h"
@@ -16,14 +17,14 @@ Hub::Hub()
 
 void Hub::attach(Device &dev)
 {
-	unsigned tag = hash32(dev.get_name(), 20);
+	unsigned tag = hash<20>(dev.get_name());
 	while(devices.count(tag))
 		++tag;
 
 	devices[tag] = &dev;
-	dev.signal_button_press.connect(sigc::bind(sigc::mem_fun(this, &Hub::button_press), tag));
-	dev.signal_button_release.connect(sigc::bind(sigc::mem_fun(this, &Hub::button_release), tag));
-	dev.signal_axis_motion.connect(sigc::bind(sigc::mem_fun(this, &Hub::axis_motion), tag));
+	dev.signal_button_press.connect(sigc::bind_return(sigc::bind(sigc::mem_fun(this, &Hub::button_press), tag), false));
+	dev.signal_button_release.connect(sigc::bind_return(sigc::bind(sigc::mem_fun(this, &Hub::button_release), tag), false));
+	dev.signal_axis_motion.connect(sigc::bind_return(sigc::bind(sigc::mem_fun(this, &Hub::axis_motion), tag), false));
 }
 
 std::string Hub::get_button_name(unsigned btn) const