X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fcontrol.cpp;h=18c2ffd62a1d055394e3a2df1d5929d9dd1f227a;hb=1aca77b93853ee127ac3bbf6886f7f04920542ef;hp=eee0f1523e98256604ca4e0213669134a555c4d1;hpb=7d2b4349289578b8e7f322186a1f251684ddeb01;p=libs%2Fgui.git

diff --git a/source/input/control.cpp b/source/input/control.cpp
index eee0f15..18c2ffd 100644
--- a/source/input/control.cpp
+++ b/source/input/control.cpp
@@ -1,7 +1,10 @@
+#include <sigc++/bind_return.h>
 #include <msp/strings/lexicalcast.h>
 #include "control.h"
 #include "device.h"
 
+using namespace std;
+
 namespace Msp {
 namespace Input {
 
@@ -28,7 +31,7 @@ std::string ControlSource::str() const
 	else if(type==NONE)
 		return "None";
 
-	return lexical_cast(index);
+	return lexical_cast<string>(index);
 }
 
 
@@ -52,8 +55,8 @@ void Control::capture(Device &d)
 {
 	notify_callbacks();
 	capture_dev = &d;
-	capture_dev->signal_button_press.connect(sigc::mem_fun(this, &Control::button_press));
-	capture_dev->signal_axis_motion.connect(sigc::mem_fun(this, &Control::axis_motion));
+	capture_dev->signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Control::button_press), false));
+	capture_dev->signal_axis_motion.connect(sigc::bind_return(sigc::mem_fun(this, &Control::axis_motion), false));
 }
 
 void Control::cancel_capture()
@@ -82,12 +85,12 @@ void Control::connect_signals()
 	case NONE:
 		break;
 	case BUTTON:
-		src.dev->signal_button_press.connect(sigc::mem_fun(this, &Control::button_press));
-		src.dev->signal_button_release.connect(sigc::mem_fun(this, &Control::button_release));
+		src.dev->signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Control::button_press), false));
+		src.dev->signal_button_release.connect(sigc::bind_return(sigc::mem_fun(this, &Control::button_release), false));
 		break;
 	case AXIS_POS:
 	case AXIS_NEG:
-		src.dev->signal_axis_motion.connect(sigc::mem_fun(this, &Control::axis_motion));
+		src.dev->signal_axis_motion.connect(sigc::bind_return(sigc::mem_fun(this, &Control::axis_motion), false));
 		break;
 	}
 }