Merging from trunk

[inkscape.git] / src / seltrans-handles.h

diff --git a/src/seltrans-handles.h b/src/seltrans-handles.h
index 8e3851f2e5034c386bd7e3c983eebdecd8bfb05f..4a0dd0bf779b015f3e6474b37a0ed9c1217e8b23 100644 (file)
--- a/src/seltrans-handles.h
+++ b/src/seltrans-handles.h
@@ -13,6 +13,7 @@
  */
 
 #include "display/sodipodi-ctrl.h"
+#include <2geom/forward.h>
 
 namespace Inkscape
 {
@@ -22,30 +23,30 @@ namespace Inkscape
 class SPSelTransHandle;
 
 // request handlers
-bool sp_sel_trans_scale_request(Inkscape::SelTrans *seltrans,
-                                   SPSelTransHandle const &handle, NR::Point &p, guint state);
-bool sp_sel_trans_stretch_request(Inkscape::SelTrans *seltrans,
-                                     SPSelTransHandle const &handle, NR::Point &p, guint state);
-bool sp_sel_trans_skew_request(Inkscape::SelTrans *seltrans,
-                                  SPSelTransHandle const &handle, NR::Point &p, guint state);
-bool sp_sel_trans_rotate_request(Inkscape::SelTrans *seltrans,
-                                    SPSelTransHandle const &handle, NR::Point &p, guint state);
-bool sp_sel_trans_center_request(Inkscape::SelTrans *seltrans,
-                                    SPSelTransHandle const &handle, NR::Point &p, guint state);
+gboolean sp_sel_trans_scale_request(Inkscape::SelTrans *seltrans,
+                                   SPSelTransHandle const &handle, Geom::Point &p, guint state);
+gboolean sp_sel_trans_stretch_request(Inkscape::SelTrans *seltrans,
+                                     SPSelTransHandle const &handle, Geom::Point &p, guint state);
+gboolean sp_sel_trans_skew_request(Inkscape::SelTrans *seltrans,
+                                  SPSelTransHandle const &handle, Geom::Point &p, guint state);
+gboolean sp_sel_trans_rotate_request(Inkscape::SelTrans *seltrans,
+                                    SPSelTransHandle const &handle, Geom::Point &p, guint state);
+gboolean sp_sel_trans_center_request(Inkscape::SelTrans *seltrans,
+                                    SPSelTransHandle const &handle, Geom::Point &p, guint state);
 
 // action handlers
-void sp_sel_trans_scale(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, NR::Point &p, guint state);
-void sp_sel_trans_stretch(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, NR::Point &p, guint state);
-void sp_sel_trans_skew(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, NR::Point &p, guint state);
-void sp_sel_trans_rotate(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, NR::Point &p, guint state);
-void sp_sel_trans_center(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, NR::Point &p, guint state);
+void sp_sel_trans_scale(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, Geom::Point &p, guint state);
+void sp_sel_trans_stretch(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, Geom::Point &p, guint state);
+void sp_sel_trans_skew(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, Geom::Point &p, guint state);
+void sp_sel_trans_rotate(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, Geom::Point &p, guint state);
+void sp_sel_trans_center(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, Geom::Point &p, guint state);
 
 struct SPSelTransHandle {
        GtkAnchorType anchor;
        GdkCursorType cursor;
        guint control;
-       void (* action) (Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, NR::Point &p, guint state);
-       bool (* request) (Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, NR::Point &p, guint state);
+       void (* action) (Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, Geom::Point &p, guint state);
+       gboolean (* request) (Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, Geom::Point &p, guint state);
        gdouble x, y;
 };