Stop deriving SPCanvasItem from GtkObject

(bzr r11469.1.1)

7 files changed, 8 insertions, 8 deletions

diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp
index 85320618b..0da28061e 100644
--- a/src/ui/dialog/spellcheck.cpp
+++ b/src/ui/dialog/spellcheck.cpp
@@ -220,7 +220,7 @@ void SpellCheck::clearRects()
 {
     for (GSList *it = _rects; it; it = it->next) {
         sp_canvas_item_hide((SPCanvasItem*) it->data);
-        gtk_object_destroy((SPCanvasItem*) it->data);
+        sp_canvas_item_destroy((SPCanvasItem*) it->data);
     }
     g_slist_free(_rects);
     _rects = NULL;
@@ -729,7 +729,7 @@ SpellCheck::deleteLastRect ()
 {
     if (_rects) {
         sp_canvas_item_hide(SP_CANVAS_ITEM(_rects->data));
-        gtk_object_destroy(GTK_OBJECT(_rects->data));
+        sp_canvas_item_destroy(SP_CANVAS_ITEM(_rects->data));
         _rects = _rects->next; // pop latest-prepended rect
     }
 }
diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index c3e7ccbe6..e1ee71d53 100644
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -115,7 +115,7 @@ ControlPoint::~ControlPoint()
 
     g_signal_handler_disconnect(G_OBJECT(_canvas_item), _event_handler_connection);
     //sp_canvas_item_hide(_canvas_item);
-    gtk_object_destroy(_canvas_item);
+    sp_canvas_item_destroy(_canvas_item);
 }
 
 void ControlPoint::_commonInit()
diff --git a/src/ui/tool/node-tool.cpp b/src/ui/tool/node-tool.cpp
index 76b309ad6..8dfee6e65 100644
--- a/src/ui/tool/node-tool.cpp
+++ b/src/ui/tool/node-tool.cpp
@@ -158,7 +158,7 @@ SPCanvasGroup *create_control_group(SPDesktop *d)
 
 void destroy_group(SPCanvasGroup *g)
 {
-    gtk_object_destroy(GTK_OBJECT(g));
+    sp_canvas_item_destroy(SP_CANVAS_ITEM(g));
 }
 
 void ink_node_tool_class_init(InkNodeToolClass *klass)
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 8098cbee2..136309a8e 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -120,7 +120,7 @@ Handle::Handle(NodeSharedData const &data, Geom::Point const &initial_pos, Node
 Handle::~Handle()
 {
     //sp_canvas_item_hide(_handle_line);
-    gtk_object_destroy(_handle_line);
+    sp_canvas_item_destroy(_handle_line);
 }
 
 void Handle::setVisible(bool v)
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index e292a9347..35eb23f42 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -152,7 +152,7 @@ PathManipulator::~PathManipulator()
 {
     delete _dragpoint;
     delete _observer;
-    gtk_object_destroy(_outline);
+    sp_canvas_item_destroy(_outline);
     _spcurve->unref();
     clear();
 }
diff --git a/src/ui/tool/selector.cpp b/src/ui/tool/selector.cpp
index 5122d3c0f..4a414e4ea 100644
--- a/src/ui/tool/selector.cpp
+++ b/src/ui/tool/selector.cpp
@@ -47,7 +47,7 @@ public:
     }
 
     ~SelectorPoint() {
-        gtk_object_destroy(_rubber);
+        sp_canvas_item_destroy(_rubber);
     }
 
     SPDesktop *desktop() { return _desktop; }
diff --git a/src/ui/widget/ruler.cpp b/src/ui/widget/ruler.cpp
index 189f20093..b97ef4312 100644
--- a/src/ui/widget/ruler.cpp
+++ b/src/ui/widget/ruler.cpp
@@ -177,7 +177,7 @@ Ruler::on_button_release_event(GdkEventButton *evb)
         Gdk::Window::pointer_ungrab(evb->time);
 #endif
 
-        gtk_object_destroy(GTK_OBJECT(_guide));
+        sp_canvas_item_destroy(_guide);
         _guide = 0;
         _dragging = false;