diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-05-16 22:50:49 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-05-16 22:50:49 +0000 |
| commit | 0b4c777cd97d627cd0f5e09266286c1bd17e44c2 (patch) | |
| tree | 2971b39262a47f760bc567a07be794eb362f76ff /src/svg-view-widget.cpp | |
| parent | remove GtkObject use in color-item (diff) | |
| download | inkscape-0b4c777cd97d627cd0f5e09266286c1bd17e44c2.tar.gz inkscape-0b4c777cd97d627cd0f5e09266286c1bd17e44c2.zip | |
Drop some GtkObject usage
(bzr r11370)
Diffstat (limited to 'src/svg-view-widget.cpp')
| -rw-r--r-- | src/svg-view-widget.cpp | 13 |
1 files changed, 6 insertions, 7 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); } } |