diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-04-09 20:12:07 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-04-09 20:12:07 +0000 |
| commit | 1d8f1753cd8cab38d19fcc26a4ad70ba2e794ac8 (patch) | |
| tree | b010ac32dcfd9923c2ec38dff3b70955242dfa70 /src/common-context.cpp | |
| parent | Started conversion of SPEventContext tree; added virtual pads to all classes. (diff) | |
| download | inkscape-1d8f1753cd8cab38d19fcc26a4ad70ba2e794ac8.tar.gz inkscape-1d8f1753cd8cab38d19fcc26a4ad70ba2e794ac8.zip | |
Added constructors to EventContext tree / some missing virtual pads.
(bzr r11608.1.90)
Diffstat (limited to 'src/common-context.cpp')
| -rw-r--r-- | src/common-context.cpp | 24 |
1 files changed, 19 insertions, 5 deletions
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); |
