Added constructors to EventContext tree / some missing virtual pads.

(bzr r11608.1.90)

1 files changed, 13 insertions, 5 deletions

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);