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/select-context.cpp | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'src/select-context.cpp') diff --git a/src/select-context.cpp b/src/select-context.cpp index 294849e44..b28920868 100644 --- a/src/select-context.cpp +++ b/src/select-context.cpp @@ -79,23 +79,26 @@ sp_select_context_class_init(SPSelectContextClass *klass) object_class->dispose = sp_select_context_dispose; - event_context_class->setup = sp_select_context_setup; - event_context_class->set = sp_select_context_set; - event_context_class->root_handler = sp_select_context_root_handler; - event_context_class->item_handler = sp_select_context_item_handler; +// event_context_class->setup = sp_select_context_setup; +// event_context_class->set = sp_select_context_set; +// event_context_class->root_handler = sp_select_context_root_handler; +// event_context_class->item_handler = sp_select_context_item_handler; } CSelectContext::CSelectContext(SPSelectContext* selectcontext) : CEventContext(selectcontext) { this->spselectcontext = selectcontext; } -static void -sp_select_context_init(SPSelectContext *sc) -{ +SPSelectContext::SPSelectContext() : SPEventContext() { + SPSelectContext* sc = this; + sc->cselectcontext = new CSelectContext(sc); delete sc->ceventcontext; sc->ceventcontext = sc->cselectcontext; + sc->grabbed = 0; + sc->item = 0; + sc->dragging = FALSE; sc->moved = FALSE; sc->button_press_shift = false; @@ -128,6 +131,12 @@ sp_select_context_init(SPSelectContext *sc) handles[12] = gdk_pixbuf_new_from_xpm_data((gchar const **)handle_center_xpm); } +static void +sp_select_context_init(SPSelectContext *sc) +{ + new (sc) SPSelectContext(); +} + static void sp_select_context_dispose(GObject *object) { -- cgit v1.2.3