diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-07-06 01:59:32 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-07-06 01:59:32 +0000 |
| commit | e65a02ed32b78534739aba24929ece7c44dd967f (patch) | |
| tree | 13cf022f18f6b5bae46aad4bc339e512f069a514 /src/knot.cpp | |
| parent | Pull 2Geom revision 2013 (extra constructors for Rect). (diff) | |
| parent | Text edit dialog: Apply button should grab default only after adding to window (diff) | |
| download | inkscape-e65a02ed32b78534739aba24929ece7c44dd967f.tar.gz inkscape-e65a02ed32b78534739aba24929ece7c44dd967f.zip | |
Merge from trunk
(bzr r10347.1.5)
Diffstat (limited to 'src/knot.cpp')
| -rw-r--r-- | src/knot.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
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); |