X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fcontrol.h;h=e5679639cf49eabefc9429c1fc83ab32618c60d8;hb=88fa30c4d5d3a25778791d094dca2964038ead4e;hp=5b435dcf0a1f478ee0994657998bd87e09eaec9e;hpb=1238b80d08c1983dfa8914f78b294cd44b1a275b;p=libs%2Fgui.git

diff --git a/source/input/control.h b/source/input/control.h
index 5b435dc..e567963 100644
--- a/source/input/control.h
+++ b/source/input/control.h
@@ -1,12 +1,5 @@
-/* $Id$
-
-This file is part of libmspgbase
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#ifndef MSP_GBASE_CONTROL_H_
-#define MSP_GBASE_CONTROL_H_
+#ifndef MSP_INPUT_CONTROL_H_
+#define MSP_INPUT_CONTROL_H_
 
 #include <string>
 #include <sigc++/signal.h>
@@ -61,10 +54,8 @@ protected:
 	Control();
 	Control(const ControlSource &);
 	Control(Device &, ControlSrcType, unsigned);
-	Control(const Control &);
 public:
-	Control &operator=(const Control &);
-	virtual ~Control() { }
+	virtual ~Control();
 
 	void capture(Device &);
 	void cancel_capture();
@@ -72,15 +63,18 @@ public:
 	void set_source(const ControlSource &);
 	const ControlSource &get_source() const { return src; }
 protected:
-	virtual void on_press() =0;
-	virtual void on_release() =0;
-	virtual void on_motion(float, float) =0;
+	virtual void on_press() = 0;
+	virtual void on_release() = 0;
+	virtual void on_motion(float, float) = 0;
 
 private:
 	void connect_signals();
 	void button_press(unsigned);
 	void button_release(unsigned);
 	void axis_motion(unsigned, float, float);
+
+	Control(const Control &);
+	Control &operator=(const Control &);
 };
 
 } // namespace Input