X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fmouse.h;h=622a783b9960efd31ff201641bd49ae2277eb681;hb=84e5e859191eeca5cf8b58da29b5f369be25c93c;hp=84f9ce0c87b49f4b7c54f5c046c3596501346e13;hpb=daf317db7a79a4c92880042125814ca942c3a6fa;p=libs%2Fgui.git

diff --git a/source/input/mouse.h b/source/input/mouse.h
index 84f9ce0..622a783 100644
--- a/source/input/mouse.h
+++ b/source/input/mouse.h
@@ -1,15 +1,9 @@
-/* $Id$
-
-This file is part of libmspgbase
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#ifndef MSP_GBASE_MOUSE_H_
-#define MSP_GBASE_MOUSE_H_
+#ifndef MSP_INPUT_MOUSE_H_
+#define MSP_INPUT_MOUSE_H_
 
+#include <sigc++/trackable.h>
+#include <msp/graphics/window.h>
 #include "device.h"
-#include "../gbase/window.h"
 
 namespace Msp {
 namespace Input {
@@ -20,7 +14,7 @@ uniform way.
 
 Note: Y axis grows upwards.
 */
-class Mouse: public Device
+class Mouse: public Device, public sigc::trackable
 {
 private:
 	Graphics::Window &window;
@@ -30,9 +24,7 @@ public:
 	virtual std::string get_button_name(unsigned) const;
 	virtual std::string get_axis_name(unsigned) const;
 private:
-	void button_press(int, int, unsigned, unsigned);
-	void button_release(int, int, unsigned, unsigned);
-	void pointer_motion(int, int);
+	void input_event(const Graphics::Window::Event &);
 };
 
 } // namespace Input