From 1d8f1753cd8cab38d19fcc26a4ad70ba2e794ac8 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 9 Apr 2013 22:12:07 +0200 Subject: Added constructors to EventContext tree / some missing virtual pads. (bzr r11608.1.90) --- src/arc-context.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 9ebce7fac..d28296ed8 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -69,22 +69,25 @@ static void sp_arc_context_class_init(SPArcContextClass *klass) object_class->dispose = sp_arc_context_dispose; - event_context_class->setup = sp_arc_context_setup; - event_context_class->finish = sp_arc_context_finish; - event_context_class->root_handler = sp_arc_context_root_handler; - event_context_class->item_handler = sp_arc_context_item_handler; +// event_context_class->setup = sp_arc_context_setup; +// event_context_class->finish = sp_arc_context_finish; +// event_context_class->root_handler = sp_arc_context_root_handler; +// event_context_class->item_handler = sp_arc_context_item_handler; } CArcContext::CArcContext(SPArcContext* arccontext) : CEventContext(arccontext) { this->sparccontext = arccontext; } -static void sp_arc_context_init(SPArcContext *arc_context) -{ +SPArcContext::SPArcContext() : SPEventContext() { + SPArcContext* arc_context = this; + arc_context->carccontext = new CArcContext(arc_context); delete arc_context->ceventcontext; arc_context->ceventcontext = arc_context->carccontext; + arc_context->_message_context = 0; + SPEventContext *event_context = SP_EVENT_CONTEXT(arc_context); event_context->cursor_shape = cursor_ellipse_xpm; @@ -102,6 +105,11 @@ static void sp_arc_context_init(SPArcContext *arc_context) new (&arc_context->sel_changed_connection) sigc::connection(); } +static void sp_arc_context_init(SPArcContext *arc_context) +{ + new (arc_context) SPArcContext(); +} + static void sp_arc_context_finish(SPEventContext *ec) { ec->ceventcontext->finish(); -- cgit v1.2.3