summaryrefslogtreecommitdiffstats
path: root/src/sp-flowtext.h
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2008-10-27 18:03:09 +0000
committerTed Gould <ted@canonical.com>2008-10-27 18:03:09 +0000
commit7dbe11bc23efa5f51a9b84e7d0f6dd16e63e0902 (patch)
tree7d3a2b95b84a03a19cb132cdf88bea0ab6dc4773 /src/sp-flowtext.h
parentMerging from trunk (diff)
downloadinkscape-7dbe11bc23efa5f51a9b84e7d0f6dd16e63e0902.tar.gz
inkscape-7dbe11bc23efa5f51a9b84e7d0f6dd16e63e0902.zip
From trunk
(bzr r6885)
Diffstat (limited to 'src/sp-flowtext.h')
-rw-r--r--src/sp-flowtext.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sp-flowtext.h b/src/sp-flowtext.h
index 144157dc9..8889c7a56 100644
--- a/src/sp-flowtext.h
+++ b/src/sp-flowtext.h
@@ -7,7 +7,7 @@
#include "sp-item.h"
#include "display/nr-arena-forward.h"
-
+#include <2geom/forward.h>
#include "libnrtype/Layout-TNG.h"
#define SP_TYPE_FLOWTEXT (sp_flowtext_get_type ())
@@ -32,9 +32,9 @@ struct SPFlowtext : public SPItem {
Inkscape::Text::Layout layout;
/** discards the NRArena objects representing this text. */
- void _clearFlow(NRArenaGroup* in_arena);
+ void _clearFlow(NRArenaGroup* in_arena);
- double par_indent;
+ double par_indent;
private:
/** Recursively walks the xml tree adding tags and their contents. */
@@ -47,12 +47,12 @@ private:
};
struct SPFlowtextClass {
- SPItemClass parent_class;
+ SPItemClass parent_class;
};
GType sp_flowtext_get_type (void);
-SPItem *create_flowtext_with_internal_frame (SPDesktop *desktop, NR::Point p1, NR::Point p2);
+SPItem *create_flowtext_with_internal_frame (SPDesktop *desktop, Geom::Point p1, Geom::Point p2);
#endif