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/common-context.cpp | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'src/common-context.cpp') diff --git a/src/common-context.cpp b/src/common-context.cpp index 39a0d7cde..1feb6ee95 100644 --- a/src/common-context.cpp +++ b/src/common-context.cpp @@ -35,21 +35,30 @@ static void sp_common_context_class_init(SPCommonContextClass *klass) object_class->dispose = sp_common_context_dispose; - event_context_class->setup = sp_common_context_setup; - event_context_class->set = sp_common_context_set; - event_context_class->root_handler = sp_common_context_root_handler; +// event_context_class->setup = sp_common_context_setup; +// event_context_class->set = sp_common_context_set; +// event_context_class->root_handler = sp_common_context_root_handler; } CCommonContext::CCommonContext(SPCommonContext* commoncontext) : CEventContext(commoncontext) { this->spcommoncontext = commoncontext; } -static void sp_common_context_init(SPCommonContext *ctx) -{ +SPCommonContext::SPCommonContext() : SPEventContext() { + SPCommonContext* ctx = this; + ctx->ccommoncontext = new CCommonContext(ctx); delete ctx->ceventcontext; ctx->ceventcontext = ctx->ccommoncontext; + ctx->_message_context = 0; + ctx->tremor = 0; + ctx->usetilt = 0; + ctx->is_drawing = false; + ctx->xtilt = 0; + ctx->ytilt = 0; + ctx->usepressure = 0; + // ctx->cursor_shape = cursor_eraser_xpm; // ctx->hot_x = 4; // ctx->hot_y = 4; @@ -88,6 +97,11 @@ static void sp_common_context_init(SPCommonContext *ctx) ctx->abs_width = false; } +static void sp_common_context_init(SPCommonContext *ctx) +{ + new (ctx) SPCommonContext(); +} + static void sp_common_context_dispose(GObject *object) { SPCommonContext *ctx = SP_COMMON_CONTEXT(object); -- cgit v1.2.3