Merge from trunk

[inkscape.git] / src / ui / tool / selectable-control-point.h

diff --git a/src/ui/tool/selectable-control-point.h b/src/ui/tool/selectable-control-point.h
index a432b68db652cd4ba594b6e1b75be9062b931c79..2fde16ea94dfd596e58a74e53c2f6859c73961d5 100644 (file)
--- a/src/ui/tool/selectable-control-point.h
+++ b/src/ui/tool/selectable-control-point.h
@@ -44,14 +44,15 @@ protected:
         ControlPointSelection &sel, ColorSet *cset = 0, SPCanvasGroup *group = 0);
 
     virtual void _setState(State state);
+
+    virtual void dragged(Geom::Point &, GdkEventMotion *);
+    virtual bool grabbed(GdkEventMotion *);
+    virtual void ungrabbed(GdkEventButton *);
+    virtual bool clicked(GdkEventButton *);
+
+    ControlPointSelection &_selection;
 private:
-    void _connectHandlers();
     void _takeSelection();
-    
-    bool _clickedHandler(GdkEventButton *);
-    void _grabbedHandler(GdkEventMotion *);
-    
-    ControlPointSelection &_selection;
 };
 
 } // namespace UI