From 69f3b6f1abb2bb422935d43262e1e99aab359954 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 2 Apr 2013 01:41:30 +0200 Subject: Added constructors to SP classes. (bzr r11608.1.67) --- src/sp-flowtext.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/sp-flowtext.cpp') diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp index 0afd91379..8b6cf4a25 100644 --- a/src/sp-flowtext.cpp +++ b/src/sp-flowtext.cpp @@ -37,7 +37,7 @@ static void sp_flowtext_init(SPFlowtext *group); static void sp_flowtext_dispose(GObject *object); -G_DEFINE_TYPE(SPFlowtext, sp_flowtext, SP_TYPE_ITEM); +G_DEFINE_TYPE(SPFlowtext, sp_flowtext, G_TYPE_OBJECT); static void sp_flowtext_class_init(SPFlowtextClass *klass) @@ -54,9 +54,9 @@ CFlowtext::CFlowtext(SPFlowtext* flowtext) : CItem(flowtext) { CFlowtext::~CFlowtext() { } -static void -sp_flowtext_init(SPFlowtext *group) -{ +SPFlowtext::SPFlowtext() : SPItem() { + SPFlowtext* group = this; + group->cflowtext = new CFlowtext(group); group->typeHierarchy.insert(typeid(SPFlowtext)); @@ -68,6 +68,12 @@ sp_flowtext_init(SPFlowtext *group) new (&group->layout) Inkscape::Text::Layout(); } +static void +sp_flowtext_init(SPFlowtext *group) +{ + new (group) SPFlowtext(); +} + static void sp_flowtext_dispose(GObject *object) { -- cgit v1.2.3