X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Finput%2Fmouse.h;h=0f0013c3964417ecd11b9181945c0aeb9525ad57;hb=d7686e3867e3c68cec0d3767a21f9d2408383085;hp=50681c11954b03b9c0d7b51f751b87f5a29f87cb;hpb=c9626e6953c16efc66575eff80c4c0de2f739041;p=libs%2Fgui.git

diff --git a/source/input/mouse.h b/source/input/mouse.h
index 50681c1..0f0013c 100644
--- a/source/input/mouse.h
+++ b/source/input/mouse.h
@@ -1,8 +1,10 @@
-#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/mspgui_api.h>
+#include <msp/graphics/window.h>
 #include "device.h"
-#include "../gbase/window.h"
 
 namespace Msp {
 namespace Input {
@@ -13,19 +15,18 @@ uniform way.
 
 Note: Y axis grows upwards.
 */
-class Mouse: public Device
+class MSPGUI_API Mouse: public Device, public sigc::trackable
 {
 private:
-	Graphics::EventSource &source;
+	Graphics::Window &window;
 
 public:
-	Mouse(Graphics::EventSource &);
-	virtual std::string get_button_name(unsigned) const;
-	virtual std::string get_axis_name(unsigned) const;
+	Mouse(Graphics::Window &);
+
+	std::string get_button_name(unsigned) const override;
+	std::string get_axis_name(unsigned) const override;
 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