Added constructors to EventContext tree / some missing virtual pads.

(bzr r11608.1.90)

1 files changed, 15 insertions, 7 deletions

diff --git a/src/spiral-context.cpp b/src/spiral-context.cpp
index fb5a85089..48be26037 100644
--- a/src/spiral-context.cpp
+++ b/src/spiral-context.cpp
@@ -67,23 +67,25 @@ sp_spiral_context_class_init(SPSpiralContextClass *klass)
 
     object_class->dispose = sp_spiral_context_dispose;
 
-    event_context_class->setup = sp_spiral_context_setup;
-    event_context_class->finish = sp_spiral_context_finish;
-    event_context_class->set = sp_spiral_context_set;
-    event_context_class->root_handler = sp_spiral_context_root_handler;
+//    event_context_class->setup = sp_spiral_context_setup;
+//    event_context_class->finish = sp_spiral_context_finish;
+//    event_context_class->set = sp_spiral_context_set;
+//    event_context_class->root_handler = sp_spiral_context_root_handler;
 }
 
 CSpiralContext::CSpiralContext(SPSpiralContext* spiralcontext) : CEventContext(spiralcontext) {
 	this->spspiralcontext = spiralcontext;
 }
 
-static void
-sp_spiral_context_init(SPSpiralContext *spiral_context)
-{
+SPSpiralContext::SPSpiralContext() : SPEventContext() {
+	SPSpiralContext* spiral_context = this;
+
 	spiral_context->cspiralcontext = new CSpiralContext(spiral_context);
 	delete spiral_context->ceventcontext;
 	spiral_context->ceventcontext = spiral_context->cspiralcontext;
 
+	spiral_context->_message_context = 0;
+
     SPEventContext *event_context = SP_EVENT_CONTEXT(spiral_context);
 
     event_context->cursor_shape = cursor_spiral_xpm;
@@ -104,6 +106,12 @@ sp_spiral_context_init(SPSpiralContext *spiral_context)
     new (&spiral_context->sel_changed_connection) sigc::connection();
 }
 
+static void
+sp_spiral_context_init(SPSpiralContext *spiral_context)
+{
+	new (spiral_context) SPSpiralContext();
+}
+
 static void sp_spiral_context_finish(SPEventContext *ec)
 {
 	ec->ceventcontext->finish();