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/flood-context.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'src/flood-context.cpp') diff --git a/src/flood-context.cpp b/src/flood-context.cpp index d8f9a2624..39002d39a 100644 --- a/src/flood-context.cpp +++ b/src/flood-context.cpp @@ -93,21 +93,24 @@ static void sp_flood_context_class_init(SPFloodContextClass *klass) object_class->dispose = sp_flood_context_dispose; - event_context_class->setup = sp_flood_context_setup; - event_context_class->root_handler = sp_flood_context_root_handler; - event_context_class->item_handler = sp_flood_context_item_handler; +// event_context_class->setup = sp_flood_context_setup; +// event_context_class->root_handler = sp_flood_context_root_handler; +// event_context_class->item_handler = sp_flood_context_item_handler; } CFloodContext::CFloodContext(SPFloodContext* floodcontext) : CEventContext(floodcontext) { this->spfloodcontext = floodcontext; } -static void sp_flood_context_init(SPFloodContext *flood_context) -{ +SPFloodContext::SPFloodContext() : SPEventContext() { + SPFloodContext* flood_context = this; + flood_context->cfloodcontext = new CFloodContext(flood_context); delete flood_context->ceventcontext; flood_context->ceventcontext = flood_context->cfloodcontext; + flood_context->_message_context = 0; + SPEventContext *event_context = SP_EVENT_CONTEXT(flood_context); event_context->cursor_shape = cursor_paintbucket_xpm; @@ -124,6 +127,11 @@ static void sp_flood_context_init(SPFloodContext *flood_context) new (&flood_context->sel_changed_connection) sigc::connection(); } +static void sp_flood_context_init(SPFloodContext *flood_context) +{ + new (flood_context) SPFloodContext(); +} + static void sp_flood_context_dispose(GObject *object) { SPFloodContext *rc = SP_FLOOD_CONTEXT(object); -- cgit v1.2.3