Drop GtkObject usage in view widgets

(bzr r11403)

3 files changed, 12 insertions, 15 deletions

diff --git a/src/svg-view-widget.cpp b/src/svg-view-widget.cpp
index ac74f893f..402b65f53 100644
--- a/src/svg-view-widget.cpp
+++ b/src/svg-view-widget.cpp
@@ -24,7 +24,7 @@
 
 static void sp_svg_view_widget_class_init (SPSVGSPViewWidgetClass *klass);
 static void sp_svg_view_widget_init (SPSVGSPViewWidget *widget);
-static void sp_svg_view_widget_destroy (GtkObject *object);
+static void sp_svg_view_widget_dispose(GObject *object);
 
 static void sp_svg_view_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
 static void sp_svg_view_widget_size_request (GtkWidget *widget, GtkRequisition *req);
@@ -69,13 +69,13 @@ GType sp_svg_view_widget_get_type(void)
  */
 static void sp_svg_view_widget_class_init(SPSVGSPViewWidgetClass *klass)
 {
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 	SPViewWidgetClass *vw_class = SP_VIEW_WIDGET_CLASS (klass);
 
 	widget_parent_class = static_cast<SPViewWidgetClass *>(g_type_class_peek_parent (klass));
 
-	object_class->destroy = sp_svg_view_widget_destroy;
+	object_class->dispose = sp_svg_view_widget_dispose;
 
 	widget_class->size_allocate = sp_svg_view_widget_size_allocate;
 #if GTK_CHECK_VERSION(3,0,0)
@@ -128,15 +128,14 @@ static void sp_svg_view_widget_init(SPSVGSPViewWidget *vw)
 /*
  * Destructor callback for SPSVGSPViewWidget objects.
  */
-static void
-sp_svg_view_widget_destroy (GtkObject *object)
+static void sp_svg_view_widget_dispose(GObject *object)
 {
 	SPSVGSPViewWidget *vw = SP_SVG_VIEW_WIDGET (object);
 
 	vw->canvas = NULL;
 
-	if (((GtkObjectClass *) (widget_parent_class))->destroy) {
-		(* ((GtkObjectClass *) (widget_parent_class))->destroy) (object);
+	if (((GObjectClass *) (widget_parent_class))->dispose) {
+		(* ((GObjectClass *) (widget_parent_class))->dispose) (object);
         }
 }
 
diff --git a/src/ui/view/view-widget.cpp b/src/ui/view/view-widget.cpp
index 7876928f7..5cb0df215 100644
--- a/src/ui/view/view-widget.cpp
+++ b/src/ui/view/view-widget.cpp
@@ -18,7 +18,7 @@
 
 static void sp_view_widget_class_init(SPViewWidgetClass *vwc);
 static void sp_view_widget_init(SPViewWidget *widget);
-static void sp_view_widget_destroy(GtkObject *object);
+static void sp_view_widget_dispose(GObject *object);
 
 static GtkEventBoxClass *widget_parent_class;
 
@@ -47,11 +47,11 @@ GType sp_view_widget_get_type(void)
  */
 static void sp_view_widget_class_init(SPViewWidgetClass *vwc)
 {
-    GtkObjectClass *object_class = GTK_OBJECT_CLASS(vwc);
+    GObjectClass *object_class = G_OBJECT_CLASS(vwc);
 
     widget_parent_class = (GtkEventBoxClass*) g_type_class_peek_parent(vwc);
     
-    object_class->destroy = sp_view_widget_destroy;
+    object_class->dispose = sp_view_widget_dispose;
 }
 
 /**
@@ -67,7 +67,7 @@ static void sp_view_widget_init(SPViewWidget *vw)
  *
  * Apparently, this gets only called when a desktop is closed, but then twice!
  */
-static void sp_view_widget_destroy(GtkObject *object)
+static void sp_view_widget_dispose(GObject *object)
 {
     SPViewWidget *vw = SP_VIEW_WIDGET(object);
 
@@ -77,8 +77,8 @@ static void sp_view_widget_destroy(GtkObject *object)
         vw->view = NULL;
     }
 
-    if (((GtkObjectClass *) (widget_parent_class))->destroy) {
-        (* ((GtkObjectClass *) (widget_parent_class))->destroy)(object);
+    if (((GObjectClass *) (widget_parent_class))->dispose) {
+        (* ((GObjectClass *) (widget_parent_class))->dispose)(object);
     }
 
     Inkscape::GC::request_early_collection();
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index 798b65abd..4fd26d11d 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -35,8 +35,6 @@ class SPObject;
 #define SP_IS_DESKTOP_WIDGET(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_DESKTOP_WIDGET))
 #define SP_IS_DESKTOP_WIDGET_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SP_TYPE_DESKTOP_WIDGET))
 
-void sp_desktop_widget_destroy (SPDesktopWidget* dtw);
-
 void sp_desktop_widget_show_decorations(SPDesktopWidget *dtw, gboolean show);
 void sp_desktop_widget_iconify(SPDesktopWidget *dtw);
 void sp_desktop_widget_maximize(SPDesktopWidget *dtw);