summaryrefslogtreecommitdiffstats
path: root/src/pen-context.cpp
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2012-06-09 13:40:09 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2012-06-09 13:40:09 +0000
commit62dd6c138e3547689acdcccbb289d822b458cdb0 (patch)
treedf7a4a357c7483216c7d805406bd79ff3c21c7c1 /src/pen-context.cpp
parentMove measure angle string to keep it visible when angle is small. (diff)
downloadinkscape-62dd6c138e3547689acdcccbb289d822b458cdb0.tar.gz
inkscape-62dd6c138e3547689acdcccbb289d822b458cdb0.zip
Stop deriving SPCanvasItem from GtkObject
(bzr r11469.1.1)
Diffstat (limited to 'src/pen-context.cpp')
-rw-r--r--src/pen-context.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/pen-context.cpp b/src/pen-context.cpp
index b97fc5527..a8aedb649 100644
--- a/src/pen-context.cpp
+++ b/src/pen-context.cpp
@@ -169,19 +169,19 @@ static void sp_pen_context_dispose(GObject *object)
SPPenContext *pc = SP_PEN_CONTEXT(object);
if (pc->c0) {
- gtk_object_destroy(GTK_OBJECT(pc->c0));
+ sp_canvas_item_destroy(pc->c0);
pc->c0 = NULL;
}
if (pc->c1) {
- gtk_object_destroy(GTK_OBJECT(pc->c1));
+ sp_canvas_item_destroy(pc->c1);
pc->c1 = NULL;
}
if (pc->cl0) {
- gtk_object_destroy(GTK_OBJECT(pc->cl0));
+ sp_canvas_item_destroy(pc->cl0);
pc->cl0 = NULL;
}
if (pc->cl1) {
- gtk_object_destroy(GTK_OBJECT(pc->cl1));
+ sp_canvas_item_destroy(pc->cl1);
pc->cl1 = NULL;
}
@@ -871,7 +871,7 @@ void pen_redraw_all (SPPenContext *const pc)
if (pc->green_bpaths) {
// remove old piecewise green canvasitems
while (pc->green_bpaths) {
- gtk_object_destroy(GTK_OBJECT(pc->green_bpaths->data));
+ sp_canvas_item_destroy(SP_CANVAS_ITEM(pc->green_bpaths->data));
pc->green_bpaths = g_slist_remove(pc->green_bpaths, pc->green_bpaths->data);
}
// one canvas bpath for all of green_curve
@@ -1135,7 +1135,7 @@ static gint pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
// Destroy topmost green bpath
if (pc->green_bpaths) {
if (pc->green_bpaths->data)
- gtk_object_destroy(GTK_OBJECT(pc->green_bpaths->data));
+ sp_canvas_item_destroy(SP_CANVAS_ITEM(pc->green_bpaths->data));
pc->green_bpaths = g_slist_remove(pc->green_bpaths, pc->green_bpaths->data);
}
// Get last segment
@@ -1182,7 +1182,7 @@ static void spdc_reset_colors(SPPenContext *pc)
sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->blue_bpath), NULL);
// Green
while (pc->green_bpaths) {
- gtk_object_destroy(GTK_OBJECT(pc->green_bpaths->data));
+ sp_canvas_item_destroy(SP_CANVAS_ITEM(pc->green_bpaths->data));
pc->green_bpaths = g_slist_remove(pc->green_bpaths, pc->green_bpaths->data);
}
pc->green_curve->reset();