Added constructors to EventContext tree / some missing virtual pads.

(bzr r11608.1.90)

1 files changed, 15 insertions, 4 deletions

diff --git a/src/mesh-context.cpp b/src/mesh-context.cpp
index 78cc49396..6c7fe05d8 100644
--- a/src/mesh-context.cpp
+++ b/src/mesh-context.cpp
@@ -70,20 +70,26 @@ static void sp_mesh_context_class_init(SPMeshContextClass *klass)
 
     object_class->dispose = sp_mesh_context_dispose;
 
-    event_context_class->setup = sp_mesh_context_setup;
-    event_context_class->root_handler  = sp_mesh_context_root_handler;
+//    event_context_class->setup = sp_mesh_context_setup;
+//    event_context_class->root_handler  = sp_mesh_context_root_handler;
 }
 
 CMeshContext::CMeshContext(SPMeshContext* meshcontext) : CEventContext(meshcontext) {
 	this->spmeshcontext = meshcontext;
 }
 
-static void sp_mesh_context_init(SPMeshContext *gr_context)
-{
+SPMeshContext::SPMeshContext() : SPEventContext() {
+	SPMeshContext* gr_context = this;
+
 	gr_context->cmeshcontext = new CMeshContext(gr_context);
 	delete gr_context->ceventcontext;
 	gr_context->ceventcontext = gr_context->cmeshcontext;
 
+	gr_context->selcon = 0;
+	gr_context->_message_context = 0;
+	gr_context->node_added = false;
+	gr_context->subselcon = 0;
+
     SPEventContext *event_context = SP_EVENT_CONTEXT(gr_context);
 
     gr_context->cursor_addnode = false;
@@ -97,6 +103,11 @@ static void sp_mesh_context_init(SPMeshContext *gr_context)
     event_context->item_to_select = NULL;
 }
 
+static void sp_mesh_context_init(SPMeshContext *gr_context)
+{
+	new (gr_context) SPMeshContext();
+}
+
 static void sp_mesh_context_dispose(GObject *object)
 {
     SPMeshContext *rc = SP_MESH_CONTEXT(object);