More GObject boilerplate reduction

(bzr r13341.1.174)

16 files changed, 34 insertions, 295 deletions

diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp
index 1b7d4f8a1..6901b8549 100644
--- a/src/widgets/gradient-image.cpp
+++ b/src/widgets/gradient-image.cpp
@@ -19,8 +19,6 @@
 
 #define VBLOCK 16
 
-static void sp_gradient_image_class_init (SPGradientImageClass *klass);
-static void sp_gradient_image_init (SPGradientImage *image);
 static void sp_gradient_image_size_request (GtkWidget *widget, GtkRequisition *requisition);
 
 #if GTK_CHECK_VERSION(3,0,0)
@@ -42,35 +40,13 @@ static void sp_gradient_image_gradient_release (SPObject *, SPGradientImage *im)
 static void sp_gradient_image_gradient_modified (SPObject *, guint flags, SPGradientImage *im);
 static void sp_gradient_image_update (SPGradientImage *img);
 
-static GtkWidgetClass *parent_class;
-
-GType sp_gradient_image_get_type(void)
-{
-        static GType type = 0;
-        if (!type) {
-                GTypeInfo info = {
-                        sizeof (SPGradientImageClass),
-                        NULL, NULL,
-                        (GClassInitFunc) sp_gradient_image_class_init,
-                        NULL, NULL,
-                        sizeof (SPGradientImage),
-                        0,
-                        (GInstanceInitFunc) sp_gradient_image_init,
-                        NULL
-                };
-                type = g_type_register_static (GTK_TYPE_WIDGET, "SPGradientImage", &info, (GTypeFlags)0);
-        }
-        return type;
-}
+G_DEFINE_TYPE(SPGradientImage, sp_gradient_image, GTK_TYPE_WIDGET);
 
 static void sp_gradient_image_class_init(SPGradientImageClass *klass)
 {
         GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
-        parent_class = GTK_WIDGET_CLASS(g_type_class_peek_parent (klass));
 
 #if GTK_CHECK_VERSION(3,0,0)
-//      GObjectClass *object_class = G_OBJECT_CLASS(klass); 
-
         widget_class->get_preferred_width = sp_gradient_image_get_preferred_width;
         widget_class->get_preferred_height = sp_gradient_image_get_preferred_height;
         widget_class->draw = sp_gradient_image_draw;
@@ -113,11 +89,11 @@ static void sp_gradient_image_destroy(GtkObject *object)
         image->modified_connection.~connection();
 
 #if GTK_CHECK_VERSION(3,0,0)
-        if (parent_class->destroy)
-                (* (parent_class)->destroy) (object);
+        if (GTK_WIDGET_CLASS(sp_gradient_image_parent_class)->destroy)
+            GTK_WIDGET_CLASS(sp_gradient_image_parent_class)->destroy(object);
 #else
-        if ((GTK_OBJECT_CLASS(parent_class))->destroy)
-                (* (GTK_OBJECT_CLASS(parent_class))->destroy) (object);
+        if (GTK_OBJECT_CLASS(sp_gradient_image_parent_class)->destroy)
+            GTK_OBJECT_CLASS(sp_gradient_image_parent_class)->destroy(object);
 #endif
 }
 
diff --git a/src/widgets/gradient-image.h b/src/widgets/gradient-image.h
index cd7e0ed70..6a9c89acf 100644
--- a/src/widgets/gradient-image.h
+++ b/src/widgets/gradient-image.h
@@ -18,8 +18,6 @@
 class SPGradient;
 
 #include <glib.h>
-
-#include <stddef.h>
 #include <sigc++/connection.h>
 
 #define SP_TYPE_GRADIENT_IMAGE (sp_gradient_image_get_type ())
diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp
index ff34fefe0..d0d302ff4 100644
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -67,10 +67,7 @@ extern guint update_in_progress;
 
 G_BEGIN_DECLS
 
-static void sp_color_icc_selector_class_init (SPColorICCSelectorClass *klass);
-static void sp_color_icc_selector_init (SPColorICCSelector *cs);
 static void sp_color_icc_selector_dispose(GObject *object);
-
 static void sp_color_icc_selector_show_all (GtkWidget *widget);
 static void sp_color_icc_selector_hide(GtkWidget *widget);
 
@@ -161,9 +158,6 @@ public:
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 };
 
-
-static SPColorSelectorClass *parent_class;
-
 #define XPAD 4
 #define YPAD 1
 
@@ -233,30 +227,7 @@ void attachToGridOrTable(GtkWidget *parent,
 
 } // namespace
 
-GType sp_color_icc_selector_get_type(void)
-{
-    static GType type = 0;
-    if (!type) {
-        static const GTypeInfo info = {
-            sizeof (SPColorICCSelectorClass),
-            NULL, // base_init
-            NULL, // base_finalize
-            (GClassInitFunc) sp_color_icc_selector_class_init,
-            NULL, // class_finalize
-            NULL, // class_data
-            sizeof (SPColorICCSelector),
-            0,    // n_preallocs
-            (GInstanceInitFunc) sp_color_icc_selector_init,
-            0,    // value_table
-        };
-
-        type = g_type_register_static (SP_TYPE_COLOR_SELECTOR,
-                                       "SPColorICCSelector",
-                                       &info,
-                                       static_cast< GTypeFlags > (0) );
-    }
-    return type;
-}
+G_DEFINE_TYPE(SPColorICCSelector, sp_color_icc_selector, SP_TYPE_COLOR_SELECTOR);
 
 static void sp_color_icc_selector_class_init(SPColorICCSelectorClass *klass)
 {
@@ -265,8 +236,6 @@ static void sp_color_icc_selector_class_init(SPColorICCSelectorClass *klass)
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
     SPColorSelectorClass *selector_class = SP_COLOR_SELECTOR_CLASS (klass);
 
-    parent_class = SP_COLOR_SELECTOR_CLASS (g_type_class_peek_parent (klass));
-
     selector_class->name = nameset;
     selector_class->submode_count = 1;
 
@@ -605,8 +574,8 @@ void ColorICCSelector::init()
 
 static void sp_color_icc_selector_dispose(GObject *object)
 {
-    if ((G_OBJECT_CLASS(parent_class))->dispose) {
-        (* (G_OBJECT_CLASS(parent_class))->dispose)(object);
+    if (G_OBJECT_CLASS(sp_color_icc_selector_parent_class)->dispose) {
+        G_OBJECT_CLASS(sp_color_icc_selector_parent_class)->dispose(object);
     }
 }
 
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index dcfd73742..9f927b51f 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -53,46 +53,21 @@ struct SPColorNotebookTracker {
     SPColorNotebook *backPointer;
 };
 
-static void sp_color_notebook_class_init (SPColorNotebookClass *klass);
-static void sp_color_notebook_init (SPColorNotebook *colorbook);
 static void sp_color_notebook_dispose(GObject *object);
 
 static void sp_color_notebook_show_all (GtkWidget *widget);
 static void sp_color_notebook_hide(GtkWidget *widget);
 
-static SPColorSelectorClass *parent_class;
-
 #define XPAD 4
 #define YPAD 1
 
-GType sp_color_notebook_get_type(void)
-{
-    static GType type = 0;
-    if (!type) {
-        GTypeInfo info = {
-            sizeof(SPColorNotebookClass),
-            0, // base_init
-            0, // base_finalize
-            (GClassInitFunc)sp_color_notebook_class_init,
-            0, // class_finalize
-            0, // class_data
-            sizeof(SPColorNotebook),
-            0, // n_preallocs
-            (GInstanceInitFunc)sp_color_notebook_init,
-            0 // value_table
-        };
-        type = g_type_register_static(SP_TYPE_COLOR_SELECTOR, "SPColorNotebook", &info, static_cast<GTypeFlags>(0));
-    }
-    return type;
-}
+G_DEFINE_TYPE(SPColorNotebook, sp_color_notebook, SP_TYPE_COLOR_SELECTOR);
 
 static void sp_color_notebook_class_init(SPColorNotebookClass *klass)
 {
     GObjectClass *object_class = reinterpret_cast<GObjectClass *>(klass);
     GtkWidgetClass *widget_class = reinterpret_cast<GtkWidgetClass *>(klass);
 
-    parent_class = SP_COLOR_SELECTOR_CLASS(g_type_class_peek_parent(klass));
-
     object_class->dispose = sp_color_notebook_dispose;
 
     widget_class->show_all = sp_color_notebook_show_all;
@@ -472,8 +447,8 @@ void ColorNotebook::init()
 
 static void sp_color_notebook_dispose(GObject *object)
 {
-    if (((GObjectClass *) (parent_class))->dispose)
-        (* ((GObjectClass *) (parent_class))->dispose) (object);
+    if (G_OBJECT_CLASS(sp_color_notebook_parent_class)->dispose)
+        G_OBJECT_CLASS(sp_color_notebook_parent_class)->dispose(object);
 }
 
 ColorNotebook::~ColorNotebook()
diff --git a/src/widgets/sp-color-notebook.h b/src/widgets/sp-color-notebook.h
index 6e5111132..50c2bb2e7 100644
--- a/src/widgets/sp-color-notebook.h
+++ b/src/widgets/sp-color-notebook.h
@@ -13,13 +13,10 @@
  */
 
 #include <gtk/gtk.h>
-#include "../color.h"
 #include "sp-color-selector.h"
 
 #include <glib.h>
 
-
-
 struct SPColorNotebook;
 
 class ColorNotebook: public ColorSelector
diff --git a/src/widgets/sp-color-scales.cpp b/src/widgets/sp-color-scales.cpp
index c98d7ce57..5fddacf59 100644
--- a/src/widgets/sp-color-scales.cpp
+++ b/src/widgets/sp-color-scales.cpp
@@ -10,6 +10,7 @@
 #include <glibmm/i18n.h>
 #include "../dialogs/dialog-events.h"
 #include "sp-color-scales.h"
+#include "sp-color-slider.h"
 #include "svg/svg-icc-color.h"
 
 #define CSC_CHANNEL_R (1 << 0)
@@ -30,8 +31,6 @@
 
 G_BEGIN_DECLS
 
-static void sp_color_scales_class_init (SPColorScalesClass *klass);
-static void sp_color_scales_init (SPColorScales *cs);
 static void sp_color_scales_dispose(GObject *object);
 
 static void sp_color_scales_show_all (GtkWidget *widget);
@@ -41,38 +40,12 @@ static const gchar *sp_color_scales_hue_map (void);
 
 G_END_DECLS
 
-static SPColorSelectorClass *parent_class;
-
 #define XPAD 4
 #define YPAD 1
 
 #define noDUMP_CHANGE_INFO 1
 
-GType
-sp_color_scales_get_type (void)
-{
-	static GType type = 0;
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof (SPColorScalesClass),
-			NULL, /* base_init */
-			NULL, /* base_finalize */
-			(GClassInitFunc) sp_color_scales_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof (SPColorScales),
-			0,	  /* n_preallocs */
-			(GInstanceInitFunc) sp_color_scales_init,
-			NULL
-		};
-
-		type = g_type_register_static (SP_TYPE_COLOR_SELECTOR,
-									   "SPColorScales",
-									   &info,
-									   static_cast< GTypeFlags > (0) );
-	}
-	return type;
-}
+G_DEFINE_TYPE(SPColorScales, sp_color_scales, SP_TYPE_COLOR_SELECTOR);
 
 static void
 sp_color_scales_class_init (SPColorScalesClass *klass)
@@ -82,8 +55,6 @@ sp_color_scales_class_init (SPColorScalesClass *klass)
 	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
 	SPColorSelectorClass *selector_class = SP_COLOR_SELECTOR_CLASS (klass);
 
-	parent_class = SP_COLOR_SELECTOR_CLASS (g_type_class_peek_parent (klass));
-
 	selector_class->name = nameset;
 	selector_class->submode_count = 3;
 
@@ -229,8 +200,8 @@ void ColorScales::init()
 
 static void sp_color_scales_dispose(GObject *object)
 {
-	if ((G_OBJECT_CLASS(parent_class))->dispose)
-		(* (G_OBJECT_CLASS(parent_class))->dispose) (object);
+	if (G_OBJECT_CLASS(sp_color_scales_parent_class)->dispose)
+            G_OBJECT_CLASS(sp_color_scales_parent_class)->dispose(object);
 }
 
 static void
diff --git a/src/widgets/sp-color-scales.h b/src/widgets/sp-color-scales.h
index 3b11bc05e..de6544d11 100644
--- a/src/widgets/sp-color-scales.h
+++ b/src/widgets/sp-color-scales.h
@@ -5,12 +5,11 @@
 #include <gtk/gtk.h>
 
 #include <color.h>
-#include <widgets/sp-color-slider.h>
 #include <widgets/sp-color-selector.h>
 
-
 struct SPColorScales;
 struct SPColorScalesClass;
+struct SPColorSlider;
 
 typedef enum {
     SP_COLOR_SCALES_MODE_NONE = 0,
diff --git a/src/widgets/sp-color-slider.cpp b/src/widgets/sp-color-slider.cpp
index 9b13ba1c5..ab7e2cd84 100644
--- a/src/widgets/sp-color-slider.cpp
+++ b/src/widgets/sp-color-slider.cpp
@@ -12,6 +12,7 @@
 
 #include <gtk/gtk.h>
 #include "sp-color-scales.h"
+#include "sp-color-slider.h"
 #include "preferences.h"
 
 #define SLIDER_WIDTH 96
@@ -26,8 +27,6 @@ enum {
 	LAST_SIGNAL
 };
 
-static void sp_color_slider_class_init (SPColorSliderClass *klass);
-static void sp_color_slider_init (SPColorSlider *slider);
 static void sp_color_slider_dispose(GObject *object);
 
 static void sp_color_slider_realize (GtkWidget *widget);
@@ -61,36 +60,15 @@ static const guchar *sp_color_slider_render_gradient (gint x0, gint y0, gint wid
 static const guchar *sp_color_slider_render_map (gint x0, gint y0, gint width, gint height,
 						 guchar *map, gint start, gint step, guint b0, guint b1, guint mask);
 
-static GtkWidgetClass *parent_class;
 static guint slider_signals[LAST_SIGNAL] = {0};
 
-GType
-sp_color_slider_get_type (void)
-{
-	static GType type = 0;
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (SPColorSliderClass),
-			NULL, NULL,
-			(GClassInitFunc) sp_color_slider_class_init,
-			NULL, NULL,
-			sizeof (SPColorSlider),
-			0,
-			(GInstanceInitFunc) sp_color_slider_init,
-			NULL
-		};
-		type = g_type_register_static (GTK_TYPE_WIDGET, "SPColorSlider", &info, (GTypeFlags)0);
-	}
-	return type;
-}
+G_DEFINE_TYPE(SPColorSlider, sp_color_slider, GTK_TYPE_WIDGET);
 
 static void sp_color_slider_class_init(SPColorSliderClass *klass)
 {
 	GObjectClass   *object_class = G_OBJECT_CLASS(klass);
 	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
 
-	parent_class = GTK_WIDGET_CLASS(g_type_class_peek_parent(klass));
-
 	slider_signals[GRABBED] = g_signal_new ("grabbed",
 						  G_TYPE_FROM_CLASS(object_class),
 						  (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
@@ -183,8 +161,8 @@ static void sp_color_slider_dispose(GObject *object)
 		slider->adjustment = NULL;
 	}
 
-	if ((G_OBJECT_CLASS(parent_class))->dispose)
-		(* (G_OBJECT_CLASS(parent_class))->dispose) (object);
+	if (G_OBJECT_CLASS(sp_color_slider_parent_class)->dispose)
+            G_OBJECT_CLASS(sp_color_slider_parent_class)->dispose (object);
 }
 
 static void
diff --git a/src/widgets/sp-color-slider.h b/src/widgets/sp-color-slider.h
index 591d8368a..85db01081 100644
--- a/src/widgets/sp-color-slider.h
+++ b/src/widgets/sp-color-slider.h
@@ -16,11 +16,6 @@
 
 #include <glib.h>
 
-
-
-struct SPColorSlider;
-struct SPColorSliderClass;
-
 #define SP_TYPE_COLOR_SLIDER (sp_color_slider_get_type ())
 #define SP_COLOR_SLIDER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_COLOR_SLIDER, SPColorSlider))
 #define SP_COLOR_SLIDER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), SP_TYPE_COLOR_SLIDER, SPColorSliderClass))
diff --git a/src/widgets/sp-color-wheel-selector.cpp b/src/widgets/sp-color-wheel-selector.cpp
index cac78238d..404874db7 100644
--- a/src/widgets/sp-color-wheel-selector.cpp
+++ b/src/widgets/sp-color-wheel-selector.cpp
@@ -7,14 +7,13 @@
 #include "../dialogs/dialog-events.h"
 #include "sp-color-wheel-selector.h"
 #include "sp-color-scales.h"
+#include "sp-color-slider.h"
 #include "sp-color-icc-selector.h"
 #include "../svg/svg-icc-color.h"
 #include "ui/widget/gimpcolorwheel.h"
 
 G_BEGIN_DECLS
 
-static void sp_color_wheel_selector_class_init (SPColorWheelSelectorClass *klass);
-static void sp_color_wheel_selector_init (SPColorWheelSelector *cs);
 static void sp_color_wheel_selector_dispose(GObject *object);
 
 static void sp_color_wheel_selector_show_all (GtkWidget *widget);
@@ -23,36 +22,10 @@ static void sp_color_wheel_selector_hide(GtkWidget *widget);
 
 G_END_DECLS
 
-static SPColorSelectorClass *parent_class;
-
 #define XPAD 4
 #define YPAD 1
 
-GType
-sp_color_wheel_selector_get_type (void)
-{
-    static GType type = 0;
-    if (!type) {
-        static const GTypeInfo info = {
-            sizeof (SPColorWheelSelectorClass),
-            NULL, /* base_init */
-            NULL, /* base_finalize */
-            (GClassInitFunc) sp_color_wheel_selector_class_init,
-            NULL, /* class_finalize */
-            NULL, /* class_data */
-            sizeof (SPColorWheelSelector),
-            0,    /* n_preallocs */
-            (GInstanceInitFunc) sp_color_wheel_selector_init,
-            0,    /* value_table */
-        };
-
-        type = g_type_register_static (SP_TYPE_COLOR_SELECTOR,
-                                       "SPColorWheelSelector",
-                                       &info,
-                                       static_cast< GTypeFlags > (0) );
-    }
-    return type;
-}
+G_DEFINE_TYPE(SPColorWheelSelector, sp_color_wheel_selector, SP_TYPE_COLOR_SELECTOR);
 
 static void sp_color_wheel_selector_class_init(SPColorWheelSelectorClass *klass)
 {
@@ -61,8 +34,6 @@ static void sp_color_wheel_selector_class_init(SPColorWheelSelectorClass *klass)
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
     SPColorSelectorClass *selector_class = SP_COLOR_SELECTOR_CLASS (klass);
 
-    parent_class = SP_COLOR_SELECTOR_CLASS (g_type_class_peek_parent (klass));
-
     selector_class->name = nameset;
     selector_class->submode_count = 1;
 
@@ -231,8 +202,8 @@ void ColorWheelSelector::init()
 
 static void sp_color_wheel_selector_dispose(GObject *object)
 {
-    if ((G_OBJECT_CLASS(parent_class))->dispose)
-        (* (G_OBJECT_CLASS(parent_class))->dispose) (object);
+    if (G_OBJECT_CLASS(sp_color_wheel_selector_parent_class)->dispose)
+        G_OBJECT_CLASS(sp_color_wheel_selector_parent_class)->dispose(object);
 }
 
 static void
diff --git a/src/widgets/sp-color-wheel-selector.h b/src/widgets/sp-color-wheel-selector.h
index bbd377422..23ac0050d 100644
--- a/src/widgets/sp-color-wheel-selector.h
+++ b/src/widgets/sp-color-wheel-selector.h
@@ -4,12 +4,10 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include "sp-color-slider.h"
 #include "sp-color-selector.h"
 
-
-
 typedef struct _GimpColorWheel GimpColorWheel;
+struct SPColorSlider;
 struct SPColorWheelSelector;
 struct SPColorWheelSelectorClass;
 
diff --git a/src/widgets/sp-xmlview-attr-list.cpp b/src/widgets/sp-xmlview-attr-list.cpp
index 47b0ebb9d..dd763aea5 100644
--- a/src/widgets/sp-xmlview-attr-list.cpp
+++ b/src/widgets/sp-xmlview-attr-list.cpp
@@ -20,9 +20,6 @@
 #include "../xml/node-event-vector.h"
 #include "sp-xmlview-attr-list.h"
 
-static void sp_xmlview_attr_list_class_init (SPXMLViewAttrListClass * klass);
-static void sp_xmlview_attr_list_init (SPXMLViewAttrList * list);
-
 #if GTK_CHECK_VERSION(3,0,0)
 static void sp_xmlview_attr_list_destroy(GtkWidget * object);
 #else
@@ -31,8 +28,6 @@ static void sp_xmlview_attr_list_destroy(GtkObject * object);
 
 static void event_attr_changed (Inkscape::XML::Node * repr, const gchar * name, const gchar * old_value, const gchar * new_value, bool is_interactive, gpointer data);
 
-static GtkTreeViewClass * parent_class = NULL;
-
 static Inkscape::XML::NodeEventVector repr_events = {
 	NULL, /* child_added */
 	NULL, /* child_removed */
@@ -88,28 +83,7 @@ sp_xmlview_attr_list_set_repr (SPXMLViewAttrList * list, Inkscape::XML::Node * r
 	}
 }
 
-GType sp_xmlview_attr_list_get_type(void)
-{
-    static GType type = 0;
-
-    if (!type) {
-        GTypeInfo info = {
-            sizeof(SPXMLViewAttrListClass),
-            0, // base_init
-            0, // base_finalize
-            (GClassInitFunc)sp_xmlview_attr_list_class_init,
-            0, // class_finalize
-            0, // class_data
-            sizeof(SPXMLViewAttrList),
-            0, // n_preallocs
-            (GInstanceInitFunc)sp_xmlview_attr_list_init,
-            0 // value_table
-        };
-        type = g_type_register_static(GTK_TYPE_TREE_VIEW, "SPXMLViewAttrList", &info, static_cast<GTypeFlags>(0));
-    }
-
-    return type;
-}
+G_DEFINE_TYPE(SPXMLViewAttrList, sp_xmlview_attr_list, GTK_TYPE_TREE_VIEW);
 
 void sp_xmlview_attr_list_class_init (SPXMLViewAttrListClass * klass)
 {
@@ -121,8 +95,6 @@ void sp_xmlview_attr_list_class_init (SPXMLViewAttrListClass * klass)
 	object_class->destroy = sp_xmlview_attr_list_destroy;
 #endif
 
-	parent_class = GTK_TREE_VIEW_CLASS(g_type_class_peek_parent (klass));
-
         g_signal_new("row-value-changed",
                       G_TYPE_FROM_CLASS(klass),
                       G_SIGNAL_RUN_FIRST,
@@ -154,9 +126,9 @@ void sp_xmlview_attr_list_destroy(GtkObject * object)
 	sp_xmlview_attr_list_set_repr (list, NULL);
 
 #if GTK_CHECK_VERSION(3,0,0)
-	GTK_WIDGET_CLASS(parent_class)->destroy (object);
+	GTK_WIDGET_CLASS(sp_xmlview_attr_list_parent_class)->destroy (object);
 #else
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
+	GTK_OBJECT_CLASS(sp_xmlview_attr_list_parent_class)->destroy (object);
 #endif
 }
 
diff --git a/src/widgets/sp-xmlview-attr-list.h b/src/widgets/sp-xmlview-attr-list.h
index 367ef1a12..08b115bfa 100644
--- a/src/widgets/sp-xmlview-attr-list.h
+++ b/src/widgets/sp-xmlview-attr-list.h
@@ -12,10 +12,8 @@
  * Released under the GNU GPL; see COPYING for details
  */
 
-#include <stdio.h>
 #include <gtk/gtk.h>
 
-
 #define SP_TYPE_XMLVIEW_ATTR_LIST (sp_xmlview_attr_list_get_type ())
 #define SP_XMLVIEW_ATTR_LIST(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_XMLVIEW_ATTR_LIST, SPXMLViewAttrList))
 #define SP_IS_XMLVIEW_ATTR_LIST(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_XMLVIEW_ATTR_LIST))
@@ -23,7 +21,6 @@
 
 struct SPXMLViewAttrList
 {
-
 	GtkTreeView list;
 	GtkListStore *store;
 
diff --git a/src/widgets/sp-xmlview-content.cpp b/src/widgets/sp-xmlview-content.cpp
index ac64dabdb..9243760bd 100644
--- a/src/widgets/sp-xmlview-content.cpp
+++ b/src/widgets/sp-xmlview-content.cpp
@@ -23,9 +23,6 @@
 
 using Inkscape::DocumentUndo;
 
-static void sp_xmlview_content_class_init (SPXMLViewContentClass * klass);
-static void sp_xmlview_content_init (SPXMLViewContent * text);
-
 #if GTK_CHECK_VERSION(3,0,0)
 static void sp_xmlview_content_destroy(GtkWidget * object);
 #else
@@ -36,8 +33,6 @@ void sp_xmlview_content_changed (GtkTextBuffer *tb, SPXMLViewContent *text);
 
 static void event_content_changed (Inkscape::XML::Node * repr, const gchar * old_content, const gchar * new_content, gpointer data);
 
-static GtkTextViewClass * parent_class = NULL;
-
 static Inkscape::XML::NodeEventVector repr_events = {
     NULL, /* child_added */
     NULL, /* child_removed */
@@ -81,28 +76,7 @@ sp_xmlview_content_set_repr (SPXMLViewContent * text, Inkscape::XML::Node * repr
     }
 }
 
-GType sp_xmlview_content_get_type(void)
-{
-    static GType type = 0;
-
-    if (!type) {
-        GTypeInfo info = {
-            sizeof(SPXMLViewContentClass),
-            0, // base_init
-            0, // base_finalize
-            (GClassInitFunc)sp_xmlview_content_class_init,
-            0, // class_finalize
-            0, // class_data
-            sizeof(SPXMLViewContent),
-            0, // n_preallocs
-            (GInstanceInitFunc)sp_xmlview_content_init,
-            0 // value_table
-        };
-        type = g_type_register_static(GTK_TYPE_TEXT_VIEW, "SPXMLViewContent", &info, static_cast<GTypeFlags>(0));
-    }
-
-    return type;
-}
+G_DEFINE_TYPE(SPXMLViewContent, sp_xmlview_content, GTK_TYPE_TEXT_VIEW);
 
 void sp_xmlview_content_class_init(SPXMLViewContentClass * klass)
 {
@@ -113,8 +87,6 @@ void sp_xmlview_content_class_init(SPXMLViewContentClass * klass)
     GtkObjectClass * object_class = GTK_OBJECT_CLASS(klass);
     object_class->destroy = sp_xmlview_content_destroy;
 #endif
-
-    parent_class = GTK_TEXT_VIEW_CLASS(g_type_class_peek_parent (klass));
 }
 
 void
@@ -135,9 +107,9 @@ void sp_xmlview_content_destroy(GtkObject * object)
     sp_xmlview_content_set_repr (text, NULL);
 
 #if GTK_CHECK_VERSION(3,0,0)
-    GTK_WIDGET_CLASS (parent_class)->destroy (object);
+    GTK_WIDGET_CLASS (sp_xmlview_content_parent_class)->destroy (object);
 #else
-    GTK_OBJECT_CLASS (parent_class)->destroy (object);
+    GTK_OBJECT_CLASS (sp_xmlview_content_parent_class)->destroy (object);
 #endif
 }
 
diff --git a/src/widgets/sp-xmlview-content.h b/src/widgets/sp-xmlview-content.h
index 8b1342c5e..a09d2d92d 100644
--- a/src/widgets/sp-xmlview-content.h
+++ b/src/widgets/sp-xmlview-content.h
@@ -13,7 +13,6 @@
  */
 
 #include <config.h>
-#include <stdio.h>
 #include <gtk/gtk.h>
 #include <glib.h>
 
diff --git a/src/widgets/sp-xmlview-tree.cpp b/src/widgets/sp-xmlview-tree.cpp
index 9b3775a34..5dff9adf3 100644
--- a/src/widgets/sp-xmlview-tree.cpp
+++ b/src/widgets/sp-xmlview-tree.cpp
@@ -23,9 +23,6 @@ struct NodeData {
 
 enum { STORE_TEXT_COL = 0, STORE_DATA_COL, STORE_REPR_COL, STORE_N_COLS };
 
-static void sp_xmlview_tree_class_init (SPXMLViewTreeClass * klass);
-static void sp_xmlview_tree_init (SPXMLViewTree * tree);
-
 #if GTK_CHECK_VERSION(3,0,0)
 static void sp_xmlview_tree_destroy(GtkWidget * object);
 #else
@@ -90,8 +87,6 @@ static const Inkscape::XML::NodeEventVector pi_repr_events = {
         NULL  /* order_changed */
 };
 
-static GtkTreeViewClass * parent_class = NULL;
-
 GtkWidget *sp_xmlview_tree_new(Inkscape::XML::Node * repr, void * /*factory*/, void * /*data*/)
 {
     SPXMLViewTree *tree = SP_XMLVIEW_TREE(g_object_new (SP_TYPE_XMLVIEW_TREE, NULL));
@@ -122,28 +117,7 @@ GtkWidget *sp_xmlview_tree_new(Inkscape::XML::Node * repr, void * /*factory*/, v
     return GTK_WIDGET(tree);
 }
 
-GType
-sp_xmlview_tree_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof (SPXMLViewTreeClass),
-			NULL, NULL,
-			(GClassInitFunc) sp_xmlview_tree_class_init,
-			NULL, NULL,
-			sizeof (SPXMLViewTree),
-			0,
-			(GInstanceInitFunc) sp_xmlview_tree_init,
-			NULL
-		};
-		type = g_type_register_static (GTK_TYPE_TREE_VIEW, "SPXMLViewTree", &info, (GTypeFlags)0);
-	}
-
-
-	return type;
-}
+G_DEFINE_TYPE(SPXMLViewTree, sp_xmlview_tree, GTK_TYPE_TREE_VIEW);
 
 void sp_xmlview_tree_class_init(SPXMLViewTreeClass * klass)
 {
@@ -155,8 +129,6 @@ void sp_xmlview_tree_class_init(SPXMLViewTreeClass * klass)
     object_class->destroy = sp_xmlview_tree_destroy;
 #endif
     
-    parent_class = GTK_TREE_VIEW_CLASS(g_type_class_peek_parent (klass));
-
     // Signal for when a tree drag and drop has completed
     g_signal_new (  "tree_move",
         G_TYPE_FROM_CLASS(klass),
@@ -188,9 +160,9 @@ void sp_xmlview_tree_destroy(GtkObject * object)
 	sp_xmlview_tree_set_repr (tree, NULL);
 
 #if GTK_CHECK_VERSION(3,0,0)
-	GTK_WIDGET_CLASS(parent_class)->destroy (object);
+	GTK_WIDGET_CLASS(sp_xmlview_tree_parent_class)->destroy (object);
 #else
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
+	GTK_OBJECT_CLASS(sp_xmlview_tree_parent_class)->destroy (object);
 #endif
 }