diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2011-07-02 18:55:23 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2011-07-02 18:55:23 +0000 |
| commit | f496d58be9dbd47dc75cdb0cd65e4f68bfd33f62 (patch) | |
| tree | 59ab9d8e7d6cb41a19d4040d7efa9c9ccf60e42c /src | |
| parent | Fix problem with merged code where a pointer to a plain C GTK+ object was cas... (diff) | |
| download | inkscape-f496d58be9dbd47dc75cdb0cd65e4f68bfd33f62.tar.gz inkscape-f496d58be9dbd47dc75cdb0cd65e4f68bfd33f62.zip | |
GTK+ cleanup: gtk_object_set
(bzr r10405)
Diffstat (limited to 'src')
| -rw-r--r-- | src/display/sp-canvas-item.h | 2 | ||||
| -rw-r--r-- | src/knot.cpp | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/display/sp-canvas-item.h b/src/display/sp-canvas-item.h index 51e9a740e..9dbec547e 100644 --- a/src/display/sp-canvas-item.h +++ b/src/display/sp-canvas-item.h @@ -72,7 +72,7 @@ SPCanvasItem *sp_canvas_item_new(SPCanvasGroup *parent, GType type, const gchar G_END_DECLS -#define sp_canvas_item_set gtk_object_set +#define sp_canvas_item_set g_object_set void sp_canvas_item_affine_absolute(SPCanvasItem *item, Geom::Affine const &aff); diff --git a/src/knot.cpp b/src/knot.cpp index 638b31007..1ffb5269c 100644 --- a/src/knot.cpp +++ b/src/knot.cpp @@ -649,12 +649,12 @@ void sp_knot_update_ctrl(SPKnot *knot) return; } - gtk_object_set(GTK_OBJECT(knot->item), "shape", knot->shape, NULL); - gtk_object_set(GTK_OBJECT(knot->item), "mode", knot->mode, NULL); - gtk_object_set(GTK_OBJECT(knot->item), "size", (gdouble) knot->size, NULL); - gtk_object_set(GTK_OBJECT(knot->item), "anchor", knot->anchor, NULL); + g_object_set(knot->item, "shape", knot->shape, NULL); + g_object_set(knot->item, "mode", knot->mode, NULL); + g_object_set(knot->item, "size", (gdouble) knot->size, NULL); + g_object_set(knot->item, "anchor", knot->anchor, NULL); if (knot->pixbuf) { - gtk_object_set(GTK_OBJECT (knot->item), "pixbuf", knot->pixbuf, NULL); + g_object_set(knot->item, "pixbuf", knot->pixbuf, NULL); } sp_knot_set_ctrl_state(knot); @@ -666,29 +666,29 @@ void sp_knot_update_ctrl(SPKnot *knot) static void sp_knot_set_ctrl_state(SPKnot *knot) { if (knot->flags & SP_KNOT_DRAGGING) { - gtk_object_set(GTK_OBJECT (knot->item), + g_object_set(knot->item, "fill_color", knot->fill[SP_KNOT_STATE_DRAGGING], NULL); - gtk_object_set(GTK_OBJECT (knot->item), + g_object_set(knot->item, "stroke_color", knot->stroke[SP_KNOT_STATE_DRAGGING], NULL); } else if (knot->flags & SP_KNOT_MOUSEOVER) { - gtk_object_set(GTK_OBJECT(knot->item), + g_object_set(knot->item, "fill_color", knot->fill[SP_KNOT_STATE_MOUSEOVER], NULL); - gtk_object_set(GTK_OBJECT(knot->item), + g_object_set(knot->item, "stroke_color", knot->stroke[SP_KNOT_STATE_MOUSEOVER], NULL); } else { - gtk_object_set(GTK_OBJECT(knot->item), + g_object_set(knot->item, "fill_color", knot->fill[SP_KNOT_STATE_NORMAL], NULL); - gtk_object_set(GTK_OBJECT(knot->item), + g_object_set(knot->item, "stroke_color", knot->stroke[SP_KNOT_STATE_NORMAL], NULL); |