Initial removal of box3d outdated GTKish macros.

(bzr r13634)

3 files changed, 117 insertions, 79 deletions

diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp
index 83bef17c9..21f37e83d 100644
--- a/src/ui/tools/select-tool.cpp
+++ b/src/ui/tools/select-tool.cpp
@@ -264,15 +264,16 @@ sp_select_context_up_one_layer(SPDesktop *desktop)
     SPObject *const current_layer = desktop->currentLayer();
     if (current_layer) {
         SPObject *const parent = current_layer->parent;
+        SPGroup *current_group = dynamic_cast<SPGroup *>(current_layer);
         if ( parent
              && ( parent->parent
-                  || !( SP_IS_GROUP(current_layer)
-                        && ( SPGroup::LAYER
-                             == SP_GROUP(current_layer)->layerMode() ) ) ) )
+                  || !( current_group
+                        && ( SPGroup::LAYER == current_group->layerMode() ) ) ) )
         {
             desktop->setCurrentLayer(parent);
-            if (SP_IS_GROUP(current_layer) && SPGroup::LAYER != SP_GROUP(current_layer)->layerMode())
+            if (current_group && (SPGroup::LAYER != current_group->layerMode())) {
                 sp_desktop_selection(desktop)->set(current_layer);
+            }
         }
     }
 }
@@ -403,7 +404,8 @@ void SelectTool::sp_select_context_cycle_through_items(Inkscape::Selection *sele
     }
 
     Inkscape::DrawingItem *arenaitem;
-    SPItem *item = SP_ITEM(this->cycling_cur_item->data);
+    SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(cycling_cur_item->data));
+    g_assert(item != NULL);
 
     // Deactivate current item
     if (!g_list_find(this->cycling_items_selected_before, item) && selection->includes(item)) {
@@ -427,7 +429,8 @@ void SelectTool::sp_select_context_cycle_through_items(Inkscape::Selection *sele
 
     if (next) {
         this->cycling_cur_item = next;
-        item = SP_ITEM(this->cycling_cur_item->data);
+        item = dynamic_cast<SPItem *>(static_cast<SPObject *>(this->cycling_cur_item->data));
+        g_assert(item != NULL);
     }
 
     arenaitem = item->get_arenaitem(desktop->dkey);
@@ -442,8 +445,13 @@ void SelectTool::sp_select_context_cycle_through_items(Inkscape::Selection *sele
 
 void SelectTool::sp_select_context_reset_opacities() {
     for (GList *l = this->cycling_items; l != NULL; l = g_list_next(l)) {
-        Inkscape::DrawingItem *arenaitem = SP_ITEM(l->data)->get_arenaitem(this->desktop->dkey);
-        arenaitem->setOpacity(SP_SCALE24_TO_FLOAT(SP_ITEM(l->data)->style->opacity.value));
+        SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(l->data));
+        if (item) {
+            Inkscape::DrawingItem *arenaitem = item->get_arenaitem(desktop->dkey);
+            arenaitem->setOpacity(SP_SCALE24_TO_FLOAT(item->style->opacity.value));
+        } else {
+            g_assert_not_reached();
+        }
     }
 
     g_list_free(this->cycling_items);
@@ -475,8 +483,8 @@ bool SelectTool::root_handler(GdkEvent* event) {
                 if (!selection->isEmpty()) {
                     SPItem *clicked_item = static_cast<SPItem *>(selection->itemList()->data);
 
-                    if (SP_IS_GROUP(clicked_item) && !SP_IS_BOX3D(clicked_item)) { // enter group if it's not a 3D box
-                        desktop->setCurrentLayer(reinterpret_cast<SPObject *>(clicked_item));
+                    if (dynamic_cast<SPGroup *>(clicked_item) && !dynamic_cast<SPBox3D *>(clicked_item)) { // enter group if it's not a 3D box
+                        desktop->setCurrentLayer(clicked_item);
                         sp_desktop_selection(desktop)->clear();
                         this->dragging = false;
                         sp_event_context_discard_delayed_snap_event(this);
@@ -591,8 +599,11 @@ bool SelectTool::root_handler(GdkEvent* event) {
                             item_in_group = desktop->getItemAtPoint(Geom::Point(event->button.x, event->button.y), TRUE);
                             group_at_point = desktop->getGroupAtPoint(Geom::Point(event->button.x, event->button.y));
 
-                            if (SP_IS_LAYER(selection->single())) {
-                                group_at_point = SP_GROUP(selection->single());
+                            {
+                                SPGroup *selGroup = dynamic_cast<SPGroup *>(selection->single());
+                                if (selGroup && (selGroup->layerMode() == SPGroup::LAYER)) {
+                                    group_at_point = selGroup;
+                                }
                             }
 
                             // group-at-point is meant to be topmost item if it's a group,
@@ -673,10 +684,11 @@ bool SelectTool::root_handler(GdkEvent* event) {
                                 selection->toggle(this->item);
                             } else {
                                 SPObject* single = selection->single();
+                                SPGroup *singleGroup = dynamic_cast<SPGroup *>(single);
                                 // without shift, increase state (i.e. toggle scale/rotation handles)
                                 if (selection->includes(this->item)) {
                                     _seltrans->increaseState();
-                                } else if (SP_IS_LAYER(single) && single->isAncestorOf(this->item)) {
+                                } else if (singleGroup && (singleGroup->layerMode() == SPGroup::LAYER) && single->isAncestorOf(this->item)) {
                                     _seltrans->increaseState();
                                 } else {
                                     _seltrans->resetState();
@@ -818,7 +830,7 @@ bool SelectTool::root_handler(GdkEvent* event) {
                 SPItem *item = desktop->getItemAtPoint(p, true, NULL);
 
                 // Save pointer to current cycle-item so that we can find it again later, in the freshly built list
-                SPItem *tmp_cur_item = this->cycling_cur_item ? SP_ITEM(this->cycling_cur_item->data) : NULL;
+                SPItem *tmp_cur_item = this->cycling_cur_item ? dynamic_cast<SPItem *>(static_cast<SPObject *>(this->cycling_cur_item->data)) : NULL;
                 g_list_free(this->cycling_items);
                 this->cycling_items = NULL;
                 this->cycling_cur_item = NULL;
@@ -851,11 +863,14 @@ bool SelectTool::root_handler(GdkEvent* event) {
                     Inkscape::DrawingItem *arenaitem;
 
                     for(GList *l = this->cycling_items_cmp; l != NULL; l = l->next) {
-                        arenaitem = SP_ITEM(l->data)->get_arenaitem(desktop->dkey);
-                        arenaitem->setOpacity(1.0);
-                        //if (!shift_pressed && !g_list_find(this->cycling_items_selected_before, SP_ITEM(l->data)) && selection->includes(SP_ITEM(l->data)))
-                        if (!g_list_find(this->cycling_items_selected_before, SP_ITEM(l->data)) && selection->includes(SP_ITEM(l->data))) {
-                            selection->remove(SP_ITEM(l->data));
+                        SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(l->data));
+                        if (item) {
+                            arenaitem = item->get_arenaitem(desktop->dkey);
+                            arenaitem->setOpacity(1.0);
+                            //if (!shift_pressed && !g_list_find(this->cycling_items_selected_before, item) && selection->includes(item))
+                            if (!g_list_find(this->cycling_items_selected_before, item) && selection->includes(item)) {
+                                selection->remove(item);
+                            }
                         }
                     }
 
@@ -869,16 +884,19 @@ bool SelectTool::root_handler(GdkEvent* event) {
 
                     // ... and rebuild them with the new items.
                     this->cycling_items_cmp = g_list_copy(this->cycling_items);
-                    SPItem *item;
 
                     for(GList *l = this->cycling_items; l != NULL; l = l->next) {
-                        item = SP_ITEM(l->data);
-                        arenaitem = item->get_arenaitem(desktop->dkey);
-                        arenaitem->setOpacity(0.3);
-
-                        if (selection->includes(item)) {
-                            // already selected items are stored separately, too
-                            this->cycling_items_selected_before = g_list_append(this->cycling_items_selected_before, item);
+                        SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(l->data));
+                        if (item) {
+                            arenaitem = item->get_arenaitem(desktop->dkey);
+                            arenaitem->setOpacity(0.3);
+
+                            if (selection->includes(item)) {
+                                // already selected items are stored separately, too
+                                this->cycling_items_selected_before = g_list_append(this->cycling_items_selected_before, item);
+                            }
+                        } else {
+                            g_assert_not_reached();
                         }
                     }
 
@@ -1134,9 +1152,9 @@ bool SelectTool::root_handler(GdkEvent* event) {
                     if (MOD__CTRL_ONLY(event)) {
                         if (selection->singleItem()) {
                             SPItem *clicked_item = selection->singleItem();
-                            
-                            if ( SP_IS_GROUP(clicked_item) || SP_IS_BOX3D(clicked_item)) { // enter group or a 3D box
-                                desktop->setCurrentLayer(reinterpret_cast<SPObject *>(clicked_item));
+                            SPGroup *clickedGroup = dynamic_cast<SPGroup *>(clicked_item);
+                            if ( (clickedGroup && (clickedGroup->layerMode() == SPGroup::LAYER)) || dynamic_cast<SPBox3D *>(clicked_item)) { // enter group or a 3D box
+                                desktop->setCurrentLayer(clicked_item);
                                 sp_desktop_selection(desktop)->clear();
                             } else {
                                 this->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Selected object is not a group. Cannot enter."));
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 29f1b9a73..e15dbb59f 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -384,11 +384,14 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                gint _distrib)
 {
     bool did = false;
-    
-    if (SP_IS_BOX3D(item) ) {
-        // convert 3D boxes to ordinary groups before spraying their shapes
-        item = box3d_convert_to_group(SP_BOX3D(item));
-        selection->add(item);
+
+    {
+        SPBox3D *box = dynamic_cast<SPBox3D *>(item);
+        if (box) {
+            // convert 3D boxes to ordinary groups before spraying their shapes
+            item = box3d_convert_to_group(box);
+            selection->add(item);
+        }
     }
 
     double _fid = g_random_double_range(0, 1);
@@ -413,7 +416,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 parent->appendChild(copy);
 
                 SPObject *new_obj = doc->getObjectByRepr(copy);
-                item_copied = SP_ITEM(new_obj);   // Convertion object->item
+                item_copied = dynamic_cast<SPItem *>(new_obj);   // Convertion object->item
                 Geom::Point center=item->getCenter();
                 sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(_scale,_scale));
                 sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(scale,scale));
@@ -437,7 +440,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 items != NULL;
                 items = items->next) {
 
-            SPItem *item1 = SP_ITEM(items->data);
+            SPItem *item1 = dynamic_cast<SPItem *>(static_cast<SPObject *>(items->data));
             if (i == 1) {
                 parent_item = item1;
             }
@@ -458,7 +461,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Inkscape::XML::Node *copy = old_repr->duplicate(xml_doc);
                 parent->appendChild(copy);
                 SPObject *new_obj = doc->getObjectByRepr(copy);
-                item_copied = SP_ITEM(new_obj);
+                item_copied = dynamic_cast<SPItem *>(new_obj);
 
                 // Move around the cursor
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint()); 
@@ -503,7 +506,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
 
                 SPObject *clone_object = doc->getObjectByRepr(clone);
                 // Conversion object->item
-                item_copied = SP_ITEM(clone_object);
+                item_copied = dynamic_cast<SPItem *>(clone_object);
                 Geom::Point center = item->getCenter();
                 sp_spray_scale_rel(center, desktop, item_copied, Geom::Scale(_scale, _scale));
                 sp_spray_scale_rel(center, desktop, item_copied, Geom::Scale(scale, scale));
@@ -554,13 +557,16 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
         for (GSList *items = original_selection;
                 items != NULL;
                 items = items->next) {
-            sp_object_ref(SP_ITEM(items->data));
+            SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(items->data));
+            g_assert(item != NULL);
+            sp_object_ref(item);
         }
 
         for (GSList *items = original_selection;
                 items != NULL;
                 items = items->next) {
-            SPItem *item = SP_ITEM(items->data);
+            SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(items->data));
+            g_assert(item != NULL);
 
             if (is_transform_modes(tc->mode)) {
                 if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, move_force, tc->population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib)) {
@@ -576,7 +582,9 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
         for (GSList *items = original_selection;
                 items != NULL;
                 items = items->next) {
-            sp_object_unref(SP_ITEM(items->data));
+            SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(items->data));
+            g_assert(item != NULL);
+            sp_object_unref(item);
         }
     }
 
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index 75650d3af..571a17b70 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -372,13 +372,16 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P
 {
     bool did = false;
 
-    if (SP_IS_BOX3D(item) && !is_transform_mode(mode) && !is_color_mode(mode)) {
-        // convert 3D boxes to ordinary groups before tweaking their shapes
-        item = box3d_convert_to_group(SP_BOX3D(item));
-        selection->add(item);
+    {
+        SPBox3D *box = dynamic_cast<SPBox3D *>(item);
+        if (box && !is_transform_mode(mode) && !is_color_mode(mode)) {
+            // convert 3D boxes to ordinary groups before tweaking their shapes
+            item = box3d_convert_to_group(box);
+            selection->add(item);
+        }
     }
 
-    if (SP_IS_TEXT(item) || SP_IS_FLOWTEXT(item)) {
+    if (dynamic_cast<SPText *>(item) || dynamic_cast<SPFlowtext *>(item)) {
         GSList *items = g_slist_prepend (NULL, item);
         GSList *selected = NULL;
         GSList *to_select = NULL;
@@ -387,22 +390,25 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P
         g_slist_free (items);
         SPObject* newObj = doc->getObjectByRepr(static_cast<Inkscape::XML::Node *>(to_select->data));
         g_slist_free (to_select);
-        item = SP_ITEM(newObj);
+        item = dynamic_cast<SPItem *>(newObj);
+        g_assert(item != NULL);
         selection->add(item);
     }
 
-    if (SP_IS_GROUP(item) && !SP_IS_BOX3D(item)) {
+    if (dynamic_cast<SPGroup *>(item) && !dynamic_cast<SPBox3D *>(item)) {
         GSList *children = NULL;
         for (SPObject *child = item->firstChild() ; child; child = child->getNext() ) {
-            if (SP_IS_ITEM(child)) {
+            if (dynamic_cast<SPItem *>(static_cast<SPObject *>(child))) {
                 children = g_slist_prepend(children, child);
             }
         }
 
         for (GSList *i = children; i; i = i->next) {
-            SPItem *child = SP_ITEM(i->data);
-            if (sp_tweak_dilate_recursive (selection, SP_ITEM(child), p, vector, mode, radius, force, fidelity, reverse))
+            SPItem *child = dynamic_cast<SPItem *>(static_cast<SPObject *>(i->data));
+            g_assert(child != NULL);
+            if (sp_tweak_dilate_recursive (selection, child, p, vector, mode, radius, force, fidelity, reverse)) {
                 did = true;
+            }
         }
 
         g_slist_free(children);
@@ -509,13 +515,13 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P
                 }
             }
 
-        } else if (SP_IS_PATH(item) || SP_IS_SHAPE(item)) {
+        } else if (dynamic_cast<SPPath *>(item) || dynamic_cast<SPShape *>(item)) {
 
             Inkscape::XML::Node *newrepr = NULL;
             gint pos = 0;
             Inkscape::XML::Node *parent = NULL;
             char const *id = NULL;
-            if (!SP_IS_PATH(item)) {
+            if (!dynamic_cast<SPPath *>(item)) {
                 newrepr = sp_selected_item_to_curved_repr(item, 0);
                 if (!newrepr) {
                     return false;
@@ -631,7 +637,8 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P
                     if (newrepr) {
                         newrepr->setAttribute("d", str);
                     } else {
-                        if (SP_IS_LPE_ITEM(item) && SP_LPE_ITEM(item)->hasPathEffectRecursive()) {
+                        SPLPEItem *lpeitem = dynamic_cast<SPLPEItem *>(item);
+                        if (lpeitem && lpeitem->hasPathEffectRecursive()) {
                             item->getRepr()->setAttribute("inkscape:original-d", str);
                         } else {
                             item->getRepr()->setAttribute("d", str);
@@ -769,7 +776,7 @@ static void tweak_colors_in_gradient(SPItem *item, Inkscape::PaintTarget fill_or
 {
     SPGradient *gradient = getGradient(item, fill_or_stroke);
 
-    if (!gradient || !SP_IS_GRADIENT(gradient)) {
+    if (!gradient || !dynamic_cast<SPGradient *>(gradient)) {
         return;
     }
 
@@ -780,9 +787,9 @@ static void tweak_colors_in_gradient(SPItem *item, Inkscape::PaintTarget fill_or
 
     double pos = 0;
     double r = 0;
-    if (SP_IS_LINEARGRADIENT(gradient)) {
-        SPLinearGradient *lg = SP_LINEARGRADIENT(gradient);
 
+    SPLinearGradient *lg = dynamic_cast<SPLinearGradient *>(gradient);
+    if (lg) {
         Geom::Point p1(lg->x1.computed, lg->y1.computed);
         Geom::Point p2(lg->x2.computed, lg->y2.computed);
         Geom::Point pdiff(p2 - p1);
@@ -800,11 +807,13 @@ static void tweak_colors_in_gradient(SPItem *item, Inkscape::PaintTarget fill_or
         // Calculate radius in lenfth-of-gradient-line units
         r = radius / vl;
 
-    } else if (SP_IS_RADIALGRADIENT(gradient)) {
-        SPRadialGradient *rg = SP_RADIALGRADIENT(gradient);
-        Geom::Point c (rg->cx.computed, rg->cy.computed);
-        pos = Geom::L2(p - c) / rg->r.computed;
-        r = radius / rg->r.computed;
+    } else {
+        SPRadialGradient *rg = dynamic_cast<SPRadialGradient *>(gradient);
+        if (rg) {
+            Geom::Point c (rg->cx.computed, rg->cy.computed);
+            pos = Geom::L2(p - c) / rg->r.computed;
+            r = radius / rg->r.computed;
+        }
     }
 
     // Normalize pos to 0..1, taking into accound gradient spread:
@@ -836,14 +845,16 @@ static void tweak_colors_in_gradient(SPItem *item, Inkscape::PaintTarget fill_or
     double offset_h = 0;
     SPObject *child_prev = NULL;
     for (SPObject *child = vector->firstChild(); child; child = child->getNext()) {
-        if (!SP_IS_STOP(child)) {
+        SPStop *stop = dynamic_cast<SPStop *>(child);
+        if (!stop) {
             continue;
         }
-        SPStop *stop = SP_STOP (child);
 
         offset_h = stop->offset;
 
         if (child_prev) {
+            SPStop *prevStop = dynamic_cast<SPStop *>(child_prev);
+            g_assert(prevStop != NULL);
 
             if (offset_h - offset_l > r && pos_e >= offset_l && pos_e <= offset_h) {
                 // the summit falls in this interstop, and the radius is small,
@@ -853,9 +864,9 @@ static void tweak_colors_in_gradient(SPItem *item, Inkscape::PaintTarget fill_or
                 tweak_color (mode, stop->specified_color.v.c, rgb_goal,
                                   force * (pos_e - offset_l) / (offset_h - offset_l),
                                   do_h, do_s, do_l);
-                tweak_color (mode, SP_STOP(child_prev)->specified_color.v.c, rgb_goal,
-                                  force * (offset_h - pos_e) / (offset_h - offset_l),
-                                  do_h, do_s, do_l);
+                tweak_color(mode, prevStop->specified_color.v.c, rgb_goal,
+                            force * (offset_h - pos_e) / (offset_h - offset_l),
+                            do_h, do_s, do_l);
                 stop->updateRepr();
                 child_prev->updateRepr();
                 break;
@@ -863,9 +874,9 @@ static void tweak_colors_in_gradient(SPItem *item, Inkscape::PaintTarget fill_or
                 // wide brush, may affect more than 2 stops,
                 // paint each stop by the force from the profile curve
                 if (offset_l <= pos_e && offset_l > pos_e - r) {
-                    tweak_color (mode, SP_STOP(child_prev)->specified_color.v.c, rgb_goal,
-                                 force * tweak_profile (fabs (pos_e - offset_l), r),
-                                 do_h, do_s, do_l);
+                    tweak_color(mode, prevStop->specified_color.v.c, rgb_goal,
+                                force * tweak_profile (fabs (pos_e - offset_l), r),
+                                do_h, do_s, do_l);
                     child_prev->updateRepr();
                 }
 
@@ -894,10 +905,11 @@ sp_tweak_color_recursive (guint mode, SPItem *item, SPItem *item_at_point,
 {
     bool did = false;
 
-    if (SP_IS_GROUP(item)) {
+    if (dynamic_cast<SPGroup *>(item)) {
         for (SPObject *child = item->firstChild() ; child; child = child->getNext() ) {
-            if (SP_IS_ITEM(child)) {
-                if (sp_tweak_color_recursive (mode, SP_ITEM(child), item_at_point,
+            SPItem *childItem = dynamic_cast<SPItem *>(child);
+            if (childItem) {
+                if (sp_tweak_color_recursive (mode, childItem, item_at_point,
                                           fill_goal, do_fill,
                                           stroke_goal, do_stroke,
                                           opacity_goal, do_opacity,
@@ -953,11 +965,11 @@ sp_tweak_color_recursive (guint mode, SPItem *item, SPItem *item_at_point,
                     //cycle through filter primitives
                     SPObject *primitive_obj = style->getFilter()->children;
                     while (primitive_obj) {
-                        if (SP_IS_FILTER_PRIMITIVE(primitive_obj)) {
-                            SPFilterPrimitive *primitive = SP_FILTER_PRIMITIVE(primitive_obj);
+                        SPFilterPrimitive *primitive = dynamic_cast<SPFilterPrimitive *>(primitive_obj);
+                        if (primitive) {
                             //if primitive is gaussianblur
-                            if(SP_IS_GAUSSIANBLUR(primitive)) {
-                                SPGaussianBlur * spblur = SP_GAUSSIANBLUR(primitive);
+                            SPGaussianBlur * spblur = dynamic_cast<SPGaussianBlur *>(primitive);
+                            if (spblur) {
                                 float num = spblur->stdDeviation.getNumber();
                                 blur_now += num * i2dt.descrim(); // sum all blurs in the filter
                             }
@@ -1080,7 +1092,7 @@ sp_tweak_dilate (TweakTool *tc, Geom::Point event_p, Geom::Point p, Geom::Point
          items != NULL;
          items = items->next) {
 
-        SPItem *item = SP_ITEM(items->data);
+        SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(items->data));
 
         if (is_color_mode (tc->mode)) {
             if (do_fill || do_stroke || do_opacity) {