Fix compile errors from function casts in wgl

[libs/gui.git] / source / input / mouse.cpp

diff --git a/source/input/mouse.cpp b/source/input/mouse.cpp
index 0fbc940f144b23537495cf99825db4b3e09fbc8b..1b41e3654517c2adb12d02e5cb10821df70a5764 100644 (file)
--- a/source/input/mouse.cpp
+++ b/source/input/mouse.cpp
@@ -1,11 +1,4 @@
-/* $Id$
-
-This file is part of libmspgbase
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/strings/formatter.h>
+#include <msp/graphics/window.h>
 #include "mouse.h"
 
 namespace Msp {
@@ -14,14 +7,12 @@ namespace Input {
 Mouse::Mouse(Graphics::Window &w):
        window(w)
 {
-       name="Mouse";
+       name = "Mouse";
 
        buttons.resize(3);
        axes.resize(2);
 
-       window.signal_button_press.connect(sigc::mem_fun(this, &Mouse::button_press));
-       window.signal_button_release.connect(sigc::mem_fun(this, &Mouse::button_release));
-       window.signal_pointer_motion.connect(sigc::mem_fun(this, &Mouse::pointer_motion));
+       window.signal_input_event.connect(sigc::mem_fun(this, &Mouse::input_event));
 }
 
 std::string Mouse::get_button_name(unsigned btn) const
@@ -39,7 +30,7 @@ std::string Mouse::get_button_name(unsigned btn) const
        case 5:
                return "Wheel Down";
        default:
-               return format("Button %d", btn);
+               return Device::get_button_name(btn);
        }
 }
 
@@ -52,25 +43,9 @@ std::string Mouse::get_axis_name(unsigned axis) const
        case 1:
                return "Y axis";
        default:
-               return format("Axis %d", axis);
+               return Device::get_axis_name(axis);
        };
 }
 
-void Mouse::button_press(int, int, unsigned btn, unsigned)
-{
-       set_button_state(btn, true, true);
-}
-
-void Mouse::button_release(int, int, unsigned btn, unsigned)
-{
-       set_button_state(btn, false, true);
-}
-
-void Mouse::pointer_motion(int x, int y)
-{
-       set_axis_value(0, x*2.0f/window.get_width()-1.0f, true);
-       set_axis_value(1, 1.0f-y*2.0f/window.get_height(), true);
-}
-
 } // namespace Input
 } // namespace Msp