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/star-context.cpp | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'src/star-context.cpp') diff --git a/src/star-context.cpp b/src/star-context.cpp index dec70eb4a..ab75813fe 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -71,23 +71,27 @@ sp_star_context_class_init (SPStarContextClass * klass) object_class->dispose = sp_star_context_dispose; - event_context_class->setup = sp_star_context_setup; - event_context_class->finish = sp_star_context_finish; - event_context_class->set = sp_star_context_set; - event_context_class->root_handler = sp_star_context_root_handler; +// event_context_class->setup = sp_star_context_setup; +// event_context_class->finish = sp_star_context_finish; +// event_context_class->set = sp_star_context_set; +// event_context_class->root_handler = sp_star_context_root_handler; } CStarContext::CStarContext(SPStarContext* starcontext) : CEventContext(starcontext) { this->spstarcontext = starcontext; } -static void -sp_star_context_init (SPStarContext * star_context) -{ +SPStarContext::SPStarContext() : SPEventContext() { + SPStarContext* star_context = this; + star_context->cstarcontext = new CStarContext(star_context); delete star_context->ceventcontext; star_context->ceventcontext = star_context->cstarcontext; + star_context->randomized = 0; + star_context->_message_context = 0; + star_context->rounded = 0; + SPEventContext *event_context = SP_EVENT_CONTEXT (star_context); event_context->cursor_shape = cursor_star_xpm; @@ -109,6 +113,12 @@ sp_star_context_init (SPStarContext * star_context) new (&star_context->sel_changed_connection) sigc::connection(); } +static void +sp_star_context_init (SPStarContext * star_context) +{ + new (star_context) SPStarContext(); +} + static void sp_star_context_finish(SPEventContext *ec) { ec->ceventcontext->finish(); -- cgit v1.2.3