X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdisplay%2Fcanvas-text.h;h=cc194ccc42c743947404669249fae33916978117;hb=0dc33d4ce43e0bb49c63aa53b826ec4a1ff68e28;hp=54ec8c413ca2b8d295bee71e0997fbc50089fcaa;hpb=e37ac57162765656081527f452b65f64730a6900;p=inkscape.git

diff --git a/src/display/canvas-text.h b/src/display/canvas-text.h
index 54ec8c413..cc194ccc4 100644
--- a/src/display/canvas-text.h
+++ b/src/display/canvas-text.h
@@ -1,5 +1,5 @@
-#ifndef __SP_CANVASTEXT_H__
-#define __SP_CANVASTEXT_H__
+#ifndef SEEN_SP_CANVASTEXT_H
+#define SEEN_SP_CANVASTEXT_H
 
 /*
  * Canvas text.
@@ -14,21 +14,24 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "sp-canvas.h"
+#include "sp-canvas-item.h"
 
 struct SPItem;
+struct SPDesktop;
 
 #define SP_TYPE_CANVASTEXT (sp_canvastext_get_type ())
 #define SP_CANVASTEXT(obj) (GTK_CHECK_CAST ((obj), SP_TYPE_CANVASTEXT, SPCanvasText))
 #define SP_IS_CANVASTEXT(obj) (GTK_CHECK_TYPE ((obj), SP_TYPE_CANVASTEXT))
 
-struct SPCanvasText : public SPCanvasItem{
+struct SPCanvasText : public SPCanvasItem {
     SPItem *item;  // the item to which this line belongs in some sense; may be NULL for some users
     guint32 rgba;
+    guint32 rgba_stroke;
+    SPDesktop *desktop; // the desktop to which this text is attached; needed for coordinate transforms (TODO: these should be eliminated)
 
     gchar* text;
-    NR::Point s;
-    NR::Matrix affine;
+    Geom::Point s;
+    Geom::Matrix affine;
     double fontsize;
     double anchor_x;
     double anchor_y;
@@ -37,17 +40,18 @@ struct SPCanvasTextClass : public SPCanvasItemClass{};
 
 GtkType sp_canvastext_get_type (void);
 
-SPCanvasItem *sp_canvastext_new(SPCanvasGroup *parent, Geom::Point pos, gchar const *text);
+SPCanvasItem *sp_canvastext_new(SPCanvasGroup *parent, SPDesktop *desktop, Geom::Point pos, gchar const *text);
 
-void sp_canvastext_set_rgba32 (SPCanvasText *ct, guint32 rgba);
+void sp_canvastext_set_rgba32 (SPCanvasText *ct, guint32 rgba, guint32 rgba_stroke);
 void sp_canvastext_set_coords (SPCanvasText *ct, gdouble x0, gdouble y0);
-void sp_canvastext_set_coords (SPCanvasText *ct, const NR::Point start);
+void sp_canvastext_set_coords (SPCanvasText *ct, const Geom::Point start);
 void sp_canvastext_set_text (SPCanvasText *ct, gchar const* new_text);
 void sp_canvastext_set_number_as_text (SPCanvasText *ct, int num);
 void sp_canvastext_set_fontsize (SPCanvasText *ct, double size);
 void sp_canvastext_set_anchor (SPCanvasText *ct, double anchor_x, double anchor_y);
 
-#endif
+#endif // SEEN_SP_CANVASTEXT_H
+
 
 /*
   Local Variables: