Split SPCanvasItem and SPCanvasGroup to individual .h files. Removed forward header.

[inkscape.git] / src / display / sodipodi-ctrl.h

diff --git a/src/display/sodipodi-ctrl.h b/src/display/sodipodi-ctrl.h
index c0e584ce21afef560f0c2363950d90de367ba557..a708ad41b5874e2e694c076ea1ae2b7b98527ffa 100644 (file)
--- a/src/display/sodipodi-ctrl.h
+++ b/src/display/sodipodi-ctrl.h
@@ -8,10 +8,9 @@
  */
 
 #include <gtk/gtkenums.h>
-#include "sp-canvas.h"
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libnr/nr-rect-l.h>
-
+#include "sp-canvas-item.h"
 
 
 #define SP_TYPE_CTRL            (sp_ctrl_get_type ())
@@ -21,38 +20,40 @@
 #define SP_IS_CTRL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), SP_TYPE_CTRL))
 
 typedef enum {
-       SP_CTRL_SHAPE_SQUARE,
-       SP_CTRL_SHAPE_DIAMOND,
-       SP_CTRL_SHAPE_CIRCLE,
-       SP_CTRL_SHAPE_CROSS,
-       SP_CTRL_SHAPE_BITMAP,
-       SP_CTRL_SHAPE_IMAGE
+    SP_CTRL_SHAPE_SQUARE,
+    SP_CTRL_SHAPE_DIAMOND,
+    SP_CTRL_SHAPE_CIRCLE,
+    SP_CTRL_SHAPE_CROSS,
+    SP_CTRL_SHAPE_BITMAP,
+    SP_CTRL_SHAPE_IMAGE
 } SPCtrlShapeType;
 
 
 typedef enum {
-       SP_CTRL_MODE_COLOR,
-       SP_CTRL_MODE_XOR
+    SP_CTRL_MODE_COLOR,
+    SP_CTRL_MODE_XOR
 } SPCtrlModeType;
 
-struct SPCtrl : public SPCanvasItem{
-       SPCtrlShapeType shape;
-       SPCtrlModeType mode;
-       GtkAnchorType anchor;
-       gint span;
-       guint defined : 1;
-       guint shown   : 1;
-        guint build   : 1;
-       guint filled  : 1;
-       guint stroked : 1;
-       guint32 fill_color;
-       guint32 stroke_color;
-
-       NRRectL box;                    /* NB! x1 & y1 are included */
-       guchar *cache;
-       GdkPixbuf * pixbuf;
-       
-       void moveto(NR::Point const p);
+struct SPCtrl : public SPCanvasItem {
+    SPCtrlShapeType shape;
+    SPCtrlModeType mode;
+    GtkAnchorType anchor;
+    gint span;
+    guint defined : 1;
+    guint shown   : 1;
+    guint build   : 1;
+    guint filled  : 1;
+    guint stroked : 1;
+    guint32 fill_color;
+    guint32 stroke_color;
+    bool _moved;
+
+    NRRectL box;   /* NB! x1 & y1 are included */
+    guchar *cache;
+    GdkPixbuf * pixbuf;
+
+    void moveto(Geom::Point const p);
+    Geom::Point _point;
 };
 
 struct SPCtrlClass : public SPCanvasItemClass{
@@ -62,4 +63,17 @@ struct SPCtrlClass : public SPCanvasItemClass{
 
 /* Standard Gtk function */
 GtkType sp_ctrl_get_type (void);
-#endif
+
+
+#endif /* !INKSCAPE_CTRL_H */
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :