diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2012-10-29 10:01:26 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2012-10-29 10:01:26 +0000 |
| commit | 3630eed967e5b7020d1c1fc1b14fcf9819103d46 (patch) | |
| tree | 2ff0fa96e32bb6aec2c208845c81cb9a19c780a9 /src/display/sodipodi-ctrl.cpp | |
| parent | merge from trunk (r11826) (diff) | |
| parent | Fix for 165865 : Markers - fix Undo history (diff) | |
| download | inkscape-3630eed967e5b7020d1c1fc1b14fcf9819103d46.tar.gz inkscape-3630eed967e5b7020d1c1fc1b14fcf9819103d46.zip | |
merge from trunk (r11850)
(bzr r11668.1.36)
Diffstat (limited to 'src/display/sodipodi-ctrl.cpp')
| -rw-r--r-- | src/display/sodipodi-ctrl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/display/sodipodi-ctrl.cpp b/src/display/sodipodi-ctrl.cpp index e21bdff15..45dc38a37 100644 --- a/src/display/sodipodi-ctrl.cpp +++ b/src/display/sodipodi-ctrl.cpp @@ -63,10 +63,10 @@ sp_ctrl_get_type (void) static void sp_ctrl_class_init (SPCtrlClass *klass) { - SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass; + SPCanvasItemClass *item_class = SP_CANVAS_ITEM_CLASS(klass); GObjectClass *g_object_class = (GObjectClass *) klass; - parent_class = (SPCanvasItemClass *)g_type_class_peek_parent (klass); + parent_class = SP_CANVAS_ITEM_CLASS(g_type_class_peek_parent (klass)); g_object_class->set_property = sp_ctrl_set_property; g_object_class->get_property = sp_ctrl_get_property; @@ -287,8 +287,8 @@ sp_ctrl_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int fla ctrl = SP_CTRL (item); - if (((SPCanvasItemClass *) parent_class)->update) - (* ((SPCanvasItemClass *) parent_class)->update) (item, affine, flags); + if ((SP_CANVAS_ITEM_CLASS(parent_class))->update) + (* (SP_CANVAS_ITEM_CLASS(parent_class))->update) (item, affine, flags); sp_canvas_item_reset_bounds (item); |