diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-06-09 13:40:09 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-06-09 13:40:09 +0000 |
| commit | 62dd6c138e3547689acdcccbb289d822b458cdb0 (patch) | |
| tree | df7a4a357c7483216c7d805406bd79ff3c21c7c1 /src/display/guideline.cpp | |
| parent | Move measure angle string to keep it visible when angle is small. (diff) | |
| download | inkscape-62dd6c138e3547689acdcccbb289d822b458cdb0.tar.gz inkscape-62dd6c138e3547689acdcccbb289d822b458cdb0.zip | |
Stop deriving SPCanvasItem from GtkObject
(bzr r11469.1.1)
Diffstat (limited to 'src/display/guideline.cpp')
| -rw-r--r-- | src/display/guideline.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/display/guideline.cpp b/src/display/guideline.cpp index 652f4e2d7..d3385978a 100644 --- a/src/display/guideline.cpp +++ b/src/display/guideline.cpp @@ -31,7 +31,7 @@ using Inkscape::ControlManager; static void sp_guideline_class_init(SPGuideLineClass *c); static void sp_guideline_init(SPGuideLine *guideline); -static void sp_guideline_destroy(GtkObject *object); +static void sp_guideline_destroy(SPCanvasItem *object); static void sp_guideline_update(SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags); static void sp_guideline_render(SPCanvasItem *item, SPCanvasBuf *buf); @@ -68,10 +68,8 @@ static void sp_guideline_class_init(SPGuideLineClass *c) { parent_class = (SPCanvasItemClass*) g_type_class_peek_parent(c); - GtkObjectClass *object_class = (GtkObjectClass *) c; - object_class->destroy = sp_guideline_destroy; - SPCanvasItemClass *item_class = (SPCanvasItemClass *) c; + item_class->destroy = sp_guideline_destroy; item_class->update = sp_guideline_update; item_class->render = sp_guideline_render; item_class->point = sp_guideline_point; @@ -90,7 +88,7 @@ static void sp_guideline_init(SPGuideLine *gl) gl->label = NULL; } -static void sp_guideline_destroy(GtkObject *object) +static void sp_guideline_destroy(SPCanvasItem *object) { g_return_if_fail (object != NULL); g_return_if_fail (SP_IS_GUIDELINE (object)); @@ -98,13 +96,13 @@ static void sp_guideline_destroy(GtkObject *object) //g_return_if_fail (SP_IS_CTRLPOINT(SP_GUIDELINE(object)->origin)); if (SP_GUIDELINE(object)->origin != NULL && SP_IS_CTRLPOINT(SP_GUIDELINE(object)->origin)) { - gtk_object_destroy(GTK_OBJECT(SP_GUIDELINE(object)->origin)); + sp_canvas_item_destroy(SP_GUIDELINE(object)->origin); } else { // FIXME: This branch shouldn't be reached (although it seems to be harmless). //g_error("Why can it be that gl->origin is not a valid SPCtrlPoint?\n"); } - GTK_OBJECT_CLASS(parent_class)->destroy(object); + SP_CANVAS_ITEM_CLASS(parent_class)->destroy(object); } static void sp_guideline_render(SPCanvasItem *item, SPCanvasBuf *buf) @@ -290,7 +288,7 @@ void sp_guideline_set_sensitive(SPGuideLine *gl, int sensitive) void sp_guideline_delete(SPGuideLine *gl) { //gtk_object_destroy(GTK_OBJECT(gl->origin)); - gtk_object_destroy(GTK_OBJECT(gl)); + sp_canvas_item_destroy(SP_CANVAS_ITEM(gl)); } static void |