Connect manipulator directly to event signals

[r2c2.git] / source / designer / manipulator.h

diff --git a/source/designer/manipulator.h b/source/designer/manipulator.h
index 8fddced8df910f159a25e240537434e0d9dc6248..55d2425ad8bfdb98596bd33877da65eaa25e18a8 100644 (file)
--- a/source/designer/manipulator.h
+++ b/source/designer/manipulator.h
@@ -48,6 +48,7 @@ public:
 
 private:
        Designer &designer;
+       Msp::Graphics::EventSource &event_source;
        Selection &selection;
        std::vector<MTrack> tracks;
        Marklin::Point center;
@@ -63,7 +64,7 @@ private:
        std::vector<Marklin::Track *> extend_tracks;
 
 public:
-       Manipulator(Designer &, Selection &);
+       Manipulator(Designer &, Msp::Graphics::EventSource &, Selection &);
 
        void start_move();
        void start_rotate();
@@ -74,9 +75,9 @@ public:
        void even_slope(bool =false);
        void connect();
        void cancel();
-       void button_press(int, int, float, float, unsigned);
-       void pointer_motion(int, int, float, float);
 private:
+       void button_press(int, int, unsigned, unsigned);
+       void pointer_motion(int, int);
        void selection_changed();
        void update_tracks();
        void update_neighbors();