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/marker.cpp | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) (limited to 'src/marker.cpp') diff --git a/src/marker.cpp b/src/marker.cpp index adf89b0be..ef2aeaae5 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -42,7 +42,7 @@ static void sp_marker_print (SPItem *item, SPPrintContext *ctx); static void sp_marker_view_remove (SPMarker *marker, SPMarkerView *view, unsigned int destroyitems); -G_DEFINE_TYPE(SPMarker, sp_marker, SP_TYPE_GROUP); +G_DEFINE_TYPE(SPMarker, sp_marker, G_TYPE_OBJECT); /** * Initializes a SPMarkerClass object. Establishes the function pointers to the class' @@ -59,13 +59,9 @@ CMarker::CMarker(SPMarker* marker) : CGroup(marker) { CMarker::~CMarker() { } -/** - * Initializes an SPMarker object. This notes the marker's viewBox is - * not set and initializes the marker's c2p identity matrix. - */ -static void -sp_marker_init (SPMarker *marker) -{ +SPMarker::SPMarker() : SPGroup() { + SPMarker* marker = this; + marker->cmarker = new CMarker(marker); marker->typeHierarchy.insert(typeid(SPMarker)); @@ -75,11 +71,30 @@ sp_marker_init (SPMarker *marker) marker->citem = marker->cmarker; marker->cobject = marker->cmarker; + marker->aspect_clip = 0; + marker->aspect_align = 0; + marker->aspect_set = 0; + marker->markerUnits = 0; + marker->orient_auto = 0; + marker->markerUnits_set = 0; + marker->orient_set = 0; + marker->orient = 0; + marker->viewBox = Geom::OptRect(); marker->c2p.setIdentity(); marker->views = NULL; } +/** + * Initializes an SPMarker object. This notes the marker's viewBox is + * not set and initializes the marker's c2p identity matrix. + */ +static void +sp_marker_init (SPMarker *marker) +{ + new (marker) SPMarker(); +} + /** * Virtual build callback for SPMarker. * -- cgit v1.2.3