From 701002a149020e89d9023dbe56c6d0ccdb5c3aca Mon Sep 17 00:00:00 2001 From: John Smith Date: Thu, 6 Sep 2012 11:25:16 +0900 Subject: Fix for 580160 : Deleting a gradient stop using Shape tools deletes the object (bzr r11655) --- src/arc-context.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index c9bad6b4a..95ff05b37 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -370,6 +370,11 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent // do not return true, so that space would work switching to selector } break; + case GDK_KEY_Delete: + case GDK_KEY_KP_Delete: + case GDK_KEY_BackSpace: + ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY); + break; default: break; -- cgit v1.2.3 From 370a3f5cc9e39352a081e5d5dd8c43676547a6e6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 4 Oct 2012 11:45:44 +1000 Subject: code cleanup: add own includes to cpp files or make the functions static if they are not used elsewhere. (bzr r11735) --- src/arc-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 95ff05b37..9675df8e3 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -159,7 +159,7 @@ static void sp_arc_context_dispose(GObject *object) * Callback that processes the "changed" signal on the selection; * destroys old and creates new knotholder. */ -void sp_arc_context_selection_changed(Inkscape::Selection * selection, gpointer data) +static void sp_arc_context_selection_changed(Inkscape::Selection * selection, gpointer data) { SPArcContext *ac = SP_ARC_CONTEXT(data); SPEventContext *ec = SP_EVENT_CONTEXT(ac); -- cgit v1.2.3 From 4cff9f1b30d110eba814d9adc0689fa073c79157 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 31 Dec 2012 12:20:39 +0000 Subject: Replace C-style pointer casts in event contexts (bzr r12001) --- src/arc-context.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 9675df8e3..c35e0041f 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -86,10 +86,10 @@ GType sp_arc_context_get_type() static void sp_arc_context_class_init(SPArcContextClass *klass) { - GObjectClass *object_class = (GObjectClass *) klass; - SPEventContextClass *event_context_class = (SPEventContextClass *) klass; + GObjectClass *object_class = G_OBJECT_CLASS(klass); + SPEventContextClass *event_context_class = SP_EVENT_CONTEXT_CLASS(klass); - parent_class = (SPEventContextClass*) g_type_class_peek_parent(klass); + parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass)); object_class->dispose = sp_arc_context_dispose; @@ -127,8 +127,8 @@ static void sp_arc_context_finish(SPEventContext *ec) sp_arc_finish(ac); ac->sel_changed_connection.disconnect(); - if (((SPEventContextClass *) parent_class)->finish) { - ((SPEventContextClass *) parent_class)->finish(ec); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->finish) { + (SP_EVENT_CONTEXT_CLASS(parent_class))->finish(ec); } } @@ -174,8 +174,8 @@ static void sp_arc_context_setup(SPEventContext *ec) SPArcContext *ac = SP_ARC_CONTEXT(ec); Inkscape::Selection *selection = sp_desktop_selection(ec->desktop); - if (((SPEventContextClass *) parent_class)->setup) { - ((SPEventContextClass *) parent_class)->setup(ec); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->setup) { + (SP_EVENT_CONTEXT_CLASS(parent_class))->setup(ec); } ec->shape_editor = new ShapeEditor(ec->desktop); @@ -219,8 +219,8 @@ static gint sp_arc_context_item_handler(SPEventContext *event_context, SPItem *i break; } - if (((SPEventContextClass *) parent_class)->item_handler) { - ret = ((SPEventContextClass *) parent_class)->item_handler(event_context, item, event); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->item_handler) { + ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->item_handler(event_context, item, event); } return ret; @@ -401,8 +401,8 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent } if (!ret) { - if (((SPEventContextClass *) parent_class)->root_handler) { - ret = ((SPEventContextClass *) parent_class)->root_handler(event_context, event); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler) { + ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler(event_context, event); } } -- cgit v1.2.3 From d5640b0cc2463ee3470d18891fbd8304ba3339ee Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 24 Jan 2013 11:43:26 +0000 Subject: More GObject boilerplate cleanup (bzr r12059) --- src/arc-context.cpp | 44 ++++++++++---------------------------------- 1 file changed, 10 insertions(+), 34 deletions(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index c35e0041f..b5bdf58ef 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -49,8 +49,6 @@ using Inkscape::DocumentUndo; -static void sp_arc_context_class_init(SPArcContextClass *klass); -static void sp_arc_context_init(SPArcContext *arc_context); static void sp_arc_context_dispose(GObject *object); static void sp_arc_context_setup(SPEventContext *ec); @@ -62,35 +60,13 @@ static void sp_arc_drag(SPArcContext *ec, Geom::Point pt, guint state); static void sp_arc_finish(SPArcContext *ec); static void sp_arc_cancel(SPArcContext *ec); -static SPEventContextClass *parent_class; - -GType sp_arc_context_get_type() -{ - static GType type = 0; - if (!type) { - GTypeInfo info = { - sizeof(SPArcContextClass), - NULL, NULL, - (GClassInitFunc) sp_arc_context_class_init, - NULL, NULL, - sizeof(SPArcContext), - 4, - (GInstanceInitFunc) sp_arc_context_init, - NULL, /* value_table */ - }; - type = g_type_register_static(SP_TYPE_EVENT_CONTEXT, "SPArcContext", &info, (GTypeFlags) 0); - } - return type; -} +G_DEFINE_TYPE(SPArcContext, sp_arc_context, SP_TYPE_EVENT_CONTEXT); static void sp_arc_context_class_init(SPArcContextClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS(klass); SPEventContextClass *event_context_class = SP_EVENT_CONTEXT_CLASS(klass); - parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass)); - object_class->dispose = sp_arc_context_dispose; event_context_class->setup = sp_arc_context_setup; @@ -127,8 +103,8 @@ static void sp_arc_context_finish(SPEventContext *ec) sp_arc_finish(ac); ac->sel_changed_connection.disconnect(); - if ((SP_EVENT_CONTEXT_CLASS(parent_class))->finish) { - (SP_EVENT_CONTEXT_CLASS(parent_class))->finish(ec); + if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->finish) { + (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->finish(ec); } } @@ -152,7 +128,7 @@ static void sp_arc_context_dispose(GObject *object) delete ac->_message_context; - G_OBJECT_CLASS(parent_class)->dispose(object); + G_OBJECT_CLASS(sp_arc_context_parent_class)->dispose(object); } /** @@ -174,8 +150,8 @@ static void sp_arc_context_setup(SPEventContext *ec) SPArcContext *ac = SP_ARC_CONTEXT(ec); Inkscape::Selection *selection = sp_desktop_selection(ec->desktop); - if ((SP_EVENT_CONTEXT_CLASS(parent_class))->setup) { - (SP_EVENT_CONTEXT_CLASS(parent_class))->setup(ec); + if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->setup) { + (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->setup(ec); } ec->shape_editor = new ShapeEditor(ec->desktop); @@ -219,8 +195,8 @@ static gint sp_arc_context_item_handler(SPEventContext *event_context, SPItem *i break; } - if ((SP_EVENT_CONTEXT_CLASS(parent_class))->item_handler) { - ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->item_handler(event_context, item, event); + if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->item_handler) { + ret = (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->item_handler(event_context, item, event); } return ret; @@ -401,8 +377,8 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent } if (!ret) { - if ((SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler) { - ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler(event_context, event); + if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->root_handler) { + ret = (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->root_handler(event_context, event); } } -- cgit v1.2.3