diff --git a/src/sp-shape.h b/src/sp-shape.h
index 32774f60315abab3321bfbca0cfc41087037628e..4b1ded23649394f2066412c1d4be334d62b72817 100644 (file)
--- a/src/sp-shape.h
+++ b/src/sp-shape.h
*
* Copyright (C) 1999-2002 Lauris Kaplinski
* Copyright (C) 2000-2001 Ximian, Inc.
+ * Copyright (C) 2008 Johan Engelen
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
#include "display/display-forward.h"
-#include "sp-item.h"
+#include "sp-lpe-item.h"
#include "sp-marker-loc.h"
+#include <2geom/forward.h>
-
+#include <sigc++/connection.h>
#define SP_TYPE_SHAPE (sp_shape_get_type ())
#define SP_SHAPE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_SHAPE, SPShape))
#define SP_SHAPE_WRITE_PATH (1 << 2)
-struct SPShape : public SPItem {
- SPCurve *curve;
+struct SPDesktop;
+
+struct SPShape : public SPLPEItem {
+ SPCurve *curve;
SPObject *marker[SP_MARKER_LOC_QTY];
- gulong release_connect [SP_MARKER_LOC_QTY];
- gulong modified_connect [SP_MARKER_LOC_QTY];
+ sigc::connection release_connect [SP_MARKER_LOC_QTY];
+ sigc::connection modified_connect [SP_MARKER_LOC_QTY];
};
struct SPShapeClass {
- SPItemClass item_class;
+ SPLPEItemClass item_class;
/* Build bpath from extra shape attributes */
void (* set_shape) (SPShape *shape);
void sp_shape_set_marker (SPObject *object, unsigned int key, const gchar *value);
int sp_shape_has_markers (SPShape const *shape);
int sp_shape_number_of_markers (SPShape* Shape, int type);
-NR::Matrix sp_shape_marker_get_transform(SPShape const *shape, NArtBpath const *bp);
-bool sp_shape_marker_required(SPShape const *shape, int const m, NArtBpath *bp);
+
+Geom::Matrix sp_shape_marker_get_transform(Geom::Curve const & c1, Geom::Curve const & c2);
+Geom::Matrix sp_shape_marker_get_transform_at_start(Geom::Curve const & c);
+Geom::Matrix sp_shape_marker_get_transform_at_end(Geom::Curve const & c);
#endif