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/box3d-context.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src/box3d-context.cpp') diff --git a/src/box3d-context.cpp b/src/box3d-context.cpp index 7bf1d51b6..1aca7a95e 100644 --- a/src/box3d-context.cpp +++ b/src/box3d-context.cpp @@ -73,22 +73,25 @@ static void sp_box3d_context_class_init(Box3DContextClass *klass) object_class->dispose = sp_box3d_context_dispose; - event_context_class->setup = sp_box3d_context_setup; - event_context_class->finish = sp_box3d_context_finish; - event_context_class->root_handler = sp_box3d_context_root_handler; - event_context_class->item_handler = sp_box3d_context_item_handler; +// event_context_class->setup = sp_box3d_context_setup; +// event_context_class->finish = sp_box3d_context_finish; +// event_context_class->root_handler = sp_box3d_context_root_handler; +// event_context_class->item_handler = sp_box3d_context_item_handler; } CBox3DContext::CBox3DContext(Box3DContext* box3dcontext) : CEventContext(box3dcontext) { this->box3dcontext = box3dcontext; } -static void sp_box3d_context_init(Box3DContext *box3d_context) -{ +Box3DContext::Box3DContext() : SPEventContext() { + Box3DContext* box3d_context = this; + box3d_context->cbox3dcontext = new CBox3DContext(box3d_context); delete box3d_context->ceventcontext; box3d_context->ceventcontext = box3d_context->cbox3dcontext; + box3d_context->_message_context = 0; + SPEventContext *event_context = SP_EVENT_CONTEXT(box3d_context); event_context->cursor_shape = cursor_3dbox_xpm; @@ -110,6 +113,11 @@ static void sp_box3d_context_init(Box3DContext *box3d_context) new (&box3d_context->sel_changed_connection) sigc::connection(); } +static void sp_box3d_context_init(Box3DContext *box3d_context) +{ + new (box3d_context) Box3DContext(); +} + static void sp_box3d_context_finish(SPEventContext *ec) { ec->ceventcontext->finish(); -- cgit v1.2.3