From 0b4c777cd97d627cd0f5e09266286c1bd17e44c2 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 16 May 2012 23:50:49 +0100 Subject: Drop some GtkObject usage (bzr r11370) --- src/svg-view-widget.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/svg-view-widget.cpp') 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(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); } } -- cgit v1.2.3