From 2df06ae2839206a2005e926d7674a8d519b91012 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 12 Dec 2011 19:49:12 +0000 Subject: Remove unused clip_path parameter to item update method. git-svn-id: http://svn.drobilla.net/lad/trunk/ganv@3860 a436a847-0d15-0410-975c-d299462d15a1 --- ganv/canvas-base.h | 2 +- src/box.c | 3 +-- src/canvas-base.c | 17 ++++++++--------- src/circle.c | 3 +-- src/edge.c | 3 +-- src/module.c | 3 +-- src/text.c | 3 +-- src/widget.c | 6 +++--- 8 files changed, 17 insertions(+), 23 deletions(-) diff --git a/ganv/canvas-base.h b/ganv/canvas-base.h index 33e995e..80afc8c 100644 --- a/ganv/canvas-base.h +++ b/ganv/canvas-base.h @@ -115,7 +115,7 @@ struct _GanvItemClass { * affine, if used, is a pointer to a 6-element array of doubles. The * update method also recomputes the bounding box of the item. */ - void (* update)(GanvItem* item, double* affine, ArtSVP* clip_path, int flags); + void (* update)(GanvItem* item, double* affine, int flags); /* Realize an item -- create GCs, etc. */ void (* realize)(GanvItem* item); diff --git a/src/box.c b/src/box.c index d685e99..674954e 100644 --- a/src/box.c +++ b/src/box.c @@ -185,7 +185,6 @@ ganv_box_bounds(GanvItem* item, static void ganv_box_update(GanvItem* item, double* affine, - ArtSVP* clip_path, int flags) { GanvBox* box = GANV_BOX(item); @@ -196,7 +195,7 @@ ganv_box_update(GanvItem* item, request_redraw(item, &impl->old_coords, TRUE); GanvItemClass* item_class = GANV_ITEM_CLASS(parent_class); - item_class->update(item, affine, clip_path, flags); + item_class->update(item, affine, flags); // Store old coordinates in world relative coordinates in case the // group we are in moves between now and the next update diff --git a/src/canvas-base.c b/src/canvas-base.c index 853c979..61839e3 100644 --- a/src/canvas-base.c +++ b/src/canvas-base.c @@ -304,7 +304,7 @@ ganv_item_unmap(GanvItem* item) /* Update handler for canvas items */ static void -ganv_item_update(GanvItem* item, double* affine, ArtSVP* clip_path, int flags) +ganv_item_update(GanvItem* item, double* affine, int flags) { GTK_OBJECT_UNSET_FLAGS(item, GANV_ITEM_NEED_UPDATE); GTK_OBJECT_UNSET_FLAGS(item, GANV_ITEM_NEED_AFFINE); @@ -328,7 +328,7 @@ ganv_item_update(GanvItem* item, double* affine, ArtSVP* clip_path, int flags) */ static void -ganv_item_invoke_update(GanvItem* item, double* p2cpx, ArtSVP* clip_path, int flags) +ganv_item_invoke_update(GanvItem* item, double* p2cpx, int flags) { int child_flags; gdouble i2cpx[6]; @@ -389,7 +389,7 @@ ganv_item_invoke_update(GanvItem* item, double* p2cpx, ArtSVP* clip_path, int fl if (child_flags & GCI_UPDATE_MASK) { if (GANV_ITEM_GET_CLASS(item)->update) { - GANV_ITEM_GET_CLASS(item)->update(item, i2cpx, clip_path, child_flags); + GANV_ITEM_GET_CLASS(item)->update(item, i2cpx, child_flags); } } } @@ -1256,8 +1256,7 @@ static void ganv_group_get_property(GObject* object, static void ganv_group_destroy(GtkObject* object); -static void ganv_group_update(GanvItem* item, double* affine, - ArtSVP* clip_path, int flags); +static void ganv_group_update(GanvItem* item, double* affine, int flags); static void ganv_group_realize(GanvItem* item); static void ganv_group_unrealize(GanvItem* item); static void ganv_group_map(GanvItem* item); @@ -1434,7 +1433,7 @@ ganv_group_destroy(GtkObject* object) /* Update handler for canvas groups */ static void -ganv_group_update(GanvItem* item, double* affine, ArtSVP* clip_path, int flags) +ganv_group_update(GanvItem* item, double* affine, int flags) { GanvGroup* group; GList* list; @@ -1443,7 +1442,7 @@ ganv_group_update(GanvItem* item, double* affine, ArtSVP* clip_path, int flags) group = GANV_GROUP(item); - (*group_parent_class->update)(item, affine, clip_path, flags); + (*group_parent_class->update)(item, affine, flags); bbox.x0 = 0; bbox.y0 = 0; @@ -1453,7 +1452,7 @@ ganv_group_update(GanvItem* item, double* affine, ArtSVP* clip_path, int flags) for (list = group->item_list; list; list = list->next) { i = list->data; - ganv_item_invoke_update(i, affine, clip_path, flags); + ganv_item_invoke_update(i, affine, flags); child_bbox.x0 = i->x1; child_bbox.y0 = i->y1; @@ -2975,7 +2974,7 @@ update_again: w2cpx[4] = -canvas->scroll_x1 * canvas->pixels_per_unit; w2cpx[5] = -canvas->scroll_y1 * canvas->pixels_per_unit; - ganv_item_invoke_update(canvas->root, w2cpx, NULL, 0); + ganv_item_invoke_update(canvas->root, w2cpx, 0); canvas->need_update = FALSE; } diff --git a/src/circle.c b/src/circle.c index edc3ae3..c1897f9 100644 --- a/src/circle.c +++ b/src/circle.c @@ -215,7 +215,6 @@ ganv_circle_bounds(GanvItem* item, static void ganv_circle_update(GanvItem* item, double* affine, - ArtSVP* clip_path, int flags) { GanvCircle* circle = GANV_CIRCLE(item); @@ -223,7 +222,7 @@ ganv_circle_update(GanvItem* item, GanvItemClass* item_class = GANV_ITEM_CLASS(parent_class); if (item_class->update) { - (*item_class->update)(item, affine, clip_path, flags); + (*item_class->update)(item, affine, flags); } // Request redraw of old location diff --git a/src/edge.c b/src/edge.c index e54e277..85a8115 100644 --- a/src/edge.c +++ b/src/edge.c @@ -239,14 +239,13 @@ ganv_edge_bounds(GanvItem* item, static void ganv_edge_update(GanvItem* item, double* affine, - ArtSVP* clip_path, int flags) { GanvEdge* edge = GANV_EDGE(item); GanvEdgeImpl* impl = edge->impl; if (parent_class->update) { - (*parent_class->update)(item, affine, clip_path, flags); + (*parent_class->update)(item, affine, flags); } // Request redraw of old location diff --git a/src/module.c b/src/module.c index 530aabe..351bb1c 100644 --- a/src/module.c +++ b/src/module.c @@ -509,7 +509,6 @@ ganv_module_resize(GanvNode* self) static void ganv_module_update(GanvItem* item, double* affine, - ArtSVP* clip_path, int flags) { GanvNode* node = GANV_NODE(item); @@ -519,7 +518,7 @@ ganv_module_update(GanvItem* item, } GanvItemClass* item_class = GANV_ITEM_CLASS(parent_class); - item_class->update(item, affine, clip_path, flags); + item_class->update(item, affine, flags); } static void diff --git a/src/text.c b/src/text.c index 985dafc..83d53ae 100644 --- a/src/text.c +++ b/src/text.c @@ -232,7 +232,6 @@ ganv_text_bounds(GanvItem* item, static void ganv_text_update(GanvItem* item, double* affine, - ArtSVP* clip_path, int flags) { double x1, y1, x2, y2; @@ -245,7 +244,7 @@ ganv_text_update(GanvItem* item, item->x2 = x2; item->y2 = y2; - parent_class->update(item, affine, clip_path, flags); + parent_class->update(item, affine, flags); } static double diff --git a/src/widget.c b/src/widget.c index d958093..2458505 100644 --- a/src/widget.c +++ b/src/widget.c @@ -230,7 +230,7 @@ ganv_widget_set_property(GObject* object, } if (update) { - (*GANV_ITEM_GET_CLASS(item)->update)(item, NULL, NULL, 0); + (*GANV_ITEM_GET_CLASS(item)->update)(item, NULL, 0); } if (calc_bounds) { @@ -287,14 +287,14 @@ ganv_widget_get_property(GObject* object, } static void -ganv_widget_update(GanvItem* item, double* affine, ArtSVP* clip_path, int flags) +ganv_widget_update(GanvItem* item, double* affine, int flags) { GanvWidget* witem; witem = GANV_WIDGET(item); if (parent_class->update) { - (*parent_class->update)(item, affine, clip_path, flags); + (*parent_class->update)(item, affine, flags); } if (witem->widget) { -- cgit v1.2.1