Update to experimental r13531

(bzr r13090.1.106)

31 files changed, 136 insertions, 521 deletions

diff --git a/src/display/cairo-templates.h b/src/display/cairo-templates.h
index 57ec98f81..a49f925c3 100644
--- a/src/display/cairo-templates.h
+++ b/src/display/cairo-templates.h
@@ -16,6 +16,8 @@
 #include "config.h"
 #endif
 
+#include <glib.h>
+
 #ifdef HAVE_OPENMP
 #include <omp.h>
 #include "preferences.h"
@@ -25,7 +27,6 @@ static const int OPENMP_THRESHOLD = 2048;
 
 #include <algorithm>
 #include <cairo.h>
-#include <glib.h>
 #include <math.h>
 #include "display/nr-3dutils.h"
 #include "display/cairo-utils.h"
diff --git a/src/display/cairo-utils.h b/src/display/cairo-utils.h
index fa0ee8853..2a7e460e8 100644
--- a/src/display/cairo-utils.h
+++ b/src/display/cairo-utils.h
@@ -12,16 +12,15 @@
 #ifndef SEEN_INKSCAPE_DISPLAY_CAIRO_UTILS_H
 #define SEEN_INKSCAPE_DISPLAY_CAIRO_UTILS_H
 
+#include <2geom/forward.h>
 #include <boost/noncopyable.hpp>
-//#include <glibmm/threads.h> // workaround
-#include <glib.h>
 #include <cairomm/cairomm.h>
-//#include <gdkmm/pixbuf.h>
-#include <2geom/forward.h>
 #include "style.h"
 
 struct SPColor;
-void ink_cairo_pixbuf_cleanup(guchar *, void *);
+typedef struct _GdkPixbuf GdkPixbuf;
+
+void ink_cairo_pixbuf_cleanup(unsigned char *, void *);
 void convert_pixbuf_argb32_to_normal(GdkPixbuf *pb);
 
 namespace Inkscape {
diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp
index 25d35fc6b..8738b93e4 100644
--- a/src/display/canvas-arena.cpp
+++ b/src/display/canvas-arena.cpp
@@ -11,7 +11,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
+#include <gtkmm.h>
 
 #include "display/sp-canvas-util.h"
 #include "helper/sp-marshal.h"
@@ -30,8 +30,6 @@ enum {
     LAST_SIGNAL
 };
 
-static void sp_canvas_arena_class_init(SPCanvasArenaClass *klass);
-static void sp_canvas_arena_init(SPCanvasArena *group);
 static void sp_canvas_arena_destroy(SPCanvasItem *object);
 
 static void sp_canvas_arena_item_deleted(SPCanvasArena *arena, Inkscape::DrawingItem *item);
@@ -46,7 +44,6 @@ static gint sp_canvas_arena_send_event (SPCanvasArena *arena, GdkEvent *event);
 static void sp_canvas_arena_request_update (SPCanvasArena *ca, DrawingItem *item);
 static void sp_canvas_arena_request_render (SPCanvasArena *ca, Geom::IntRect const &area);
 
-static SPCanvasItemClass *parent_class;
 static guint signals[LAST_SIGNAL] = {0};
 
 struct CachePrefObserver : public Inkscape::Preferences::Observer {
@@ -70,33 +67,13 @@ struct CachePrefObserver : public Inkscape::Preferences::Observer {
     SPCanvasArena *_arena;
 };
 
-GType
-sp_canvas_arena_get_type (void)
-{
-    static GType type = 0;
-    if (!type) {
-	GTypeInfo info = {
-            sizeof (SPCanvasArenaClass),
-	    NULL, NULL,
-            (GClassInitFunc) sp_canvas_arena_class_init,
-	    NULL, NULL,
-            sizeof (SPCanvasArena),
-	    0,
-            (GInstanceInitFunc) sp_canvas_arena_init,
-	    NULL
-	};
-        type = g_type_register_static (SP_TYPE_CANVAS_ITEM, "SPCanvasArena", &info, (GTypeFlags)0);
-    }
-    return type;
-}
+G_DEFINE_TYPE(SPCanvasArena, sp_canvas_arena, SP_TYPE_CANVAS_ITEM);
 
 static void
 sp_canvas_arena_class_init (SPCanvasArenaClass *klass)
 {
     SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass;
 
-    parent_class = (SPCanvasItemClass*)g_type_class_peek_parent (klass);
-
     signals[ARENA_EVENT] = g_signal_new ("arena_event",
                                            G_TYPE_FROM_CLASS(item_class),
                                            G_SIGNAL_RUN_LAST,
@@ -149,8 +126,8 @@ static void sp_canvas_arena_destroy(SPCanvasItem *object)
     delete arena->observer;
     arena->drawing.~Drawing();
 
-    if (SP_CANVAS_ITEM_CLASS(parent_class)->destroy)
-        (* SP_CANVAS_ITEM_CLASS(parent_class)->destroy) (object);
+    if (SP_CANVAS_ITEM_CLASS(sp_canvas_arena_parent_class)->destroy)
+        SP_CANVAS_ITEM_CLASS(sp_canvas_arena_parent_class)->destroy(object);
 }
 
 static void
@@ -158,8 +135,8 @@ sp_canvas_arena_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned
 {
     SPCanvasArena *arena = SP_CANVAS_ARENA (item);
 
-    if (((SPCanvasItemClass *) parent_class)->update)
-        (* ((SPCanvasItemClass *) parent_class)->update) (item, affine, flags);
+    if (SP_CANVAS_ITEM_CLASS(sp_canvas_arena_parent_class)->update)
+        SP_CANVAS_ITEM_CLASS(sp_canvas_arena_parent_class)->update(item, affine, flags);
 
     arena->ctx.ctm = affine;
 
diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp
index ee9e14f10..46b59d25a 100644
--- a/src/display/canvas-bpath.cpp
+++ b/src/display/canvas-bpath.cpp
@@ -11,9 +11,6 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
 #include <sstream>
 #include <string.h>
 #include "desktop.h"
@@ -27,42 +24,18 @@
 #include "helper/geom.h"
 #include "display/sp-canvas.h"
 
-static void sp_canvas_bpath_class_init (SPCanvasBPathClass *klass);
-static void sp_canvas_bpath_init (SPCanvasBPath *path);
 static void sp_canvas_bpath_destroy(SPCanvasItem *object);
 
 static void sp_canvas_bpath_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags);
 static void sp_canvas_bpath_render (SPCanvasItem *item, SPCanvasBuf *buf);
 static double sp_canvas_bpath_point (SPCanvasItem *item, Geom::Point p, SPCanvasItem **actual_item);
 
-static SPCanvasItemClass *parent_class;
-
-GType
-sp_canvas_bpath_get_type (void)
-{
-    static GType type = 0;
-    if (!type) {
-	GTypeInfo info = {
-            sizeof (SPCanvasBPathClass),
-	    NULL, NULL,
-            (GClassInitFunc) sp_canvas_bpath_class_init,
-	    NULL, NULL,
-            sizeof (SPCanvasBPath),
-	    0,
-            (GInstanceInitFunc) sp_canvas_bpath_init,
-	    NULL
-	};
-        type = g_type_register_static (SP_TYPE_CANVAS_ITEM, "SPCanvasBPath", &info, (GTypeFlags)0);
-    }
-    return type;
-}
+G_DEFINE_TYPE(SPCanvasBPath, sp_canvas_bpath, SP_TYPE_CANVAS_ITEM);
 
 static void sp_canvas_bpath_class_init(SPCanvasBPathClass *klass)
 {
     SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass;
 
-    parent_class = (SPCanvasItemClass*)g_type_class_peek_parent (klass);
-
     item_class->destroy = sp_canvas_bpath_destroy;
     item_class->update = sp_canvas_bpath_update;
     item_class->render = sp_canvas_bpath_render;
@@ -90,8 +63,8 @@ static void sp_canvas_bpath_destroy(SPCanvasItem *object)
         cbp->curve = cbp->curve->unref();
     }
 
-    if (SP_CANVAS_ITEM_CLASS(parent_class)->destroy)
-        (* SP_CANVAS_ITEM_CLASS(parent_class)->destroy) (object);
+    if (SP_CANVAS_ITEM_CLASS(sp_canvas_bpath_parent_class)->destroy)
+        (* SP_CANVAS_ITEM_CLASS(sp_canvas_bpath_parent_class)->destroy) (object);
 }
 
 static void sp_canvas_bpath_update(SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags)
@@ -100,8 +73,8 @@ static void sp_canvas_bpath_update(SPCanvasItem *item, Geom::Affine const &affin
 
     item->canvas->requestRedraw((int)item->x1, (int)item->y1, (int)item->x2, (int)item->y2);
 
-    if (reinterpret_cast<SPCanvasItemClass *>(parent_class)->update) {
-        reinterpret_cast<SPCanvasItemClass *>(parent_class)->update(item, affine, flags);
+    if (reinterpret_cast<SPCanvasItemClass *>(sp_canvas_bpath_parent_class)->update) {
+        reinterpret_cast<SPCanvasItemClass *>(sp_canvas_bpath_parent_class)->update(item, affine, flags);
     }
 
     sp_canvas_item_reset_bounds (item);
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index 4b1dbd1ed..2eeaa7006 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -71,42 +71,16 @@ static gchar const *const grid_svgname[] = {
 
 // ##########################################################
 // Grid CanvasItem
-static void grid_canvasitem_class_init (GridCanvasItemClass *klass);
-static void grid_canvasitem_init (GridCanvasItem *grid);
 static void grid_canvasitem_destroy(SPCanvasItem *object);
 static void grid_canvasitem_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags);
 static void grid_canvasitem_render (SPCanvasItem *item, SPCanvasBuf *buf);
 
-static SPCanvasItemClass * parent_class;
-
-GType
-grid_canvasitem_get_type (void)
-{
-    static GType grid_canvasitem_type = 0;
-
-    if (!grid_canvasitem_type) {
-	GTypeInfo grid_canvasitem_info = {
-            sizeof (GridCanvasItemClass),
-	    NULL, NULL,
-            (GClassInitFunc) grid_canvasitem_class_init,
-	    NULL, NULL,
-            sizeof (GridCanvasItem),
-	    0,
-            (GInstanceInitFunc) grid_canvasitem_init,
-	    NULL
-	};
-        
-	grid_canvasitem_type = g_type_register_static(SPCanvasItem::getType(), "GridCanvasItem", &grid_canvasitem_info, GTypeFlags(0));
-    }
-    return grid_canvasitem_type;
-}
+G_DEFINE_TYPE(GridCanvasItem, grid_canvasitem, SP_TYPE_CANVAS_ITEM);
 
 static void grid_canvasitem_class_init(GridCanvasItemClass *klass)
 {
     SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass;
 
-    parent_class = (SPCanvasItemClass*)g_type_class_peek_parent (klass);
-
     item_class->destroy = grid_canvasitem_destroy;
     item_class->update = grid_canvasitem_update;
     item_class->render = grid_canvasitem_render;
@@ -123,8 +97,8 @@ static void grid_canvasitem_destroy(SPCanvasItem *object)
     g_return_if_fail (object != NULL);
     g_return_if_fail (INKSCAPE_IS_GRID_CANVASITEM (object));
 
-    if (SP_CANVAS_ITEM_CLASS(parent_class)->destroy)
-        (* SP_CANVAS_ITEM_CLASS(parent_class)->destroy) (object);
+    if (SP_CANVAS_ITEM_CLASS(grid_canvasitem_parent_class)->destroy)
+        (* SP_CANVAS_ITEM_CLASS(grid_canvasitem_parent_class)->destroy) (object);
 }
 
 /**
@@ -145,8 +119,8 @@ grid_canvasitem_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned
 {
     GridCanvasItem *gridcanvasitem = INKSCAPE_GRID_CANVASITEM (item);
 
-    if (parent_class->update)
-        (* parent_class->update) (item, affine, flags);
+    if (SP_CANVAS_ITEM_CLASS(grid_canvasitem_parent_class)->update)
+        SP_CANVAS_ITEM_CLASS(grid_canvasitem_parent_class)->update(item, affine, flags);
 
     if (gridcanvasitem->grid) {
         gridcanvasitem->grid->Update(affine, flags);
diff --git a/src/display/canvas-text.cpp b/src/display/canvas-text.cpp
index fe60d9c65..5ad87b4ef 100644
--- a/src/display/canvas-text.cpp
+++ b/src/display/canvas-text.cpp
@@ -12,10 +12,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <sstream>
 #include <string.h>
 
@@ -26,42 +22,17 @@
 #include "color.h"
 #include "display/sp-canvas.h"
 
-static void sp_canvastext_class_init (SPCanvasTextClass *klass);
-static void sp_canvastext_init (SPCanvasText *canvastext);
 static void sp_canvastext_destroy(SPCanvasItem *object);
 
 static void sp_canvastext_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags);
 static void sp_canvastext_render (SPCanvasItem *item, SPCanvasBuf *buf);
 
-static SPCanvasItemClass *parent_class_ct;
-
-GType
-sp_canvastext_get_type (void)
-{
-    static GType type = 0;
-
-    if (!type) {
-        GTypeInfo info = {
-            sizeof (SPCanvasTextClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_canvastext_class_init,
-            NULL, NULL,
-            sizeof (SPCanvasText),
-            0,
-            (GInstanceInitFunc) sp_canvastext_init,
-            NULL
-        };
-        type = g_type_register_static (SP_TYPE_CANVAS_ITEM, "SPCanvasText", &info, (GTypeFlags)0);
-    }
-    return type;
-}
+G_DEFINE_TYPE(SPCanvasText, sp_canvastext, SP_TYPE_CANVAS_ITEM);
 
 static void sp_canvastext_class_init(SPCanvasTextClass *klass)
 {
     SPCanvasItemClass *item_class = SP_CANVAS_ITEM_CLASS(klass);
 
-    parent_class_ct = SP_CANVAS_ITEM_CLASS(g_type_class_peek_parent(klass));
-
     item_class->destroy = sp_canvastext_destroy;
     item_class->update = sp_canvastext_update;
     item_class->render = sp_canvastext_render;
@@ -101,8 +72,8 @@ static void sp_canvastext_destroy(SPCanvasItem *object)
     canvastext->text = NULL;
     canvastext->item = NULL;
 
-    if (SP_CANVAS_ITEM_CLASS(parent_class_ct)->destroy)
-        (* SP_CANVAS_ITEM_CLASS(parent_class_ct)->destroy) (object);
+    if (SP_CANVAS_ITEM_CLASS(sp_canvastext_parent_class)->destroy)
+        SP_CANVAS_ITEM_CLASS(sp_canvastext_parent_class)->destroy(object);
 }
 
 static void
@@ -151,8 +122,8 @@ sp_canvastext_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned i
 
     item->canvas->requestRedraw((int)item->x1, (int)item->y1, (int)item->x2, (int)item->y2);
 
-    if (parent_class_ct->update)
-        (* parent_class_ct->update) (item, affine, flags);
+    if (SP_CANVAS_ITEM_CLASS(sp_canvastext_parent_class)->update)
+        SP_CANVAS_ITEM_CLASS(sp_canvastext_parent_class)->update(item, affine, flags);
 
     sp_canvas_item_reset_bounds (item);
 
diff --git a/src/display/curve.cpp b/src/display/curve.cpp
index 50f4c8954..0a39a8e7f 100644
--- a/src/display/curve.cpp
+++ b/src/display/curve.cpp
@@ -1,10 +1,4 @@
-#define __CURVE_C__
-
-/** \file
- * Routines for SPCurve and for its Geom::PathVector
- */
-
-/*
+/**
  * Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *   Johan Engelen
@@ -14,7 +8,7 @@
  * Copyright (C) 2002 Lauris Kaplinski
  * Copyright (C) 2008 Johan Engelen
  *
- * Released under GNU GPL
+ * Released under GNU GPL, see file 'COPYING' for more information
  */
 
 #include "display/curve.h"
@@ -25,6 +19,10 @@
 #include <2geom/sbasis-to-bezier.h>
 #include <2geom/point.h>
 
+/**
+ * Routines for SPCurve and for its Geom::PathVector
+ */
+
 /* Constructors */
 
 /**
@@ -686,4 +684,4 @@ SPCurve::last_point_additive_move(Geom::Point const & p)
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:
diff --git a/src/display/curve.h b/src/display/curve.h
index 4866655c4..b3f1e3702 100644
--- a/src/display/curve.h
+++ b/src/display/curve.h
@@ -1,8 +1,5 @@
-#ifndef SEEN_DISPLAY_CURVE_H
-#define SEEN_DISPLAY_CURVE_H
-
-/*
- * Author:
+/**
+ * Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *
  * Copyright (C) 2000 Lauris Kaplinski
@@ -10,17 +7,18 @@
  * Copyright (C) 2002 Lauris Kaplinski
  * Copyright (C) 2008 Johan Engelen
  *
- * Released under GNU GPL
+ * Released under GNU GPL, see file 'COPYING' for more information
  */
 
-#include <glib.h>
+#ifndef SEEN_DISPLAY_CURVE_H
+#define SEEN_DISPLAY_CURVE_H
 
+#include <glib.h>
 #include <2geom/forward.h>
-
 #include <boost/optional.hpp>
 
 /**
- * Wrapper around a Geom::PathVector objects.
+ * Wrapper around a Geom::PathVector object.
  */
 class SPCurve {
 public:
@@ -90,7 +88,7 @@ private:
     SPCurve& operator=(const SPCurve&);
 };
 
-#endif /* !SEEN_DISPLAY_CURVE_H */
+#endif // !SEEN_DISPLAY_CURVE_H
 
 /*
   Local Variables:
@@ -101,4 +99,4 @@ private:
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8 :
diff --git a/src/display/drawing-group.cpp b/src/display/drawing-group.cpp
index 38ace001f..bce89d70e 100644
--- a/src/display/drawing-group.cpp
+++ b/src/display/drawing-group.cpp
@@ -9,13 +9,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "display/cairo-utils.h"
 #include "display/drawing.h"
 #include "display/drawing-context.h"
 #include "display/drawing-item.h"
 #include "display/drawing-group.h"
 #include "style.h"
 
+#include "display/cairo-utils.h"
+
 namespace Inkscape {
 
 DrawingGroup::DrawingGroup(Drawing &drawing)
diff --git a/src/display/drawing-image.cpp b/src/display/drawing-image.cpp
index 00caef525..e56f3e58b 100644
--- a/src/display/drawing-image.cpp
+++ b/src/display/drawing-image.cpp
@@ -10,13 +10,15 @@
  */
 
 #include <2geom/bezier-curve.h>
-#include "display/cairo-utils.h"
+
 #include "display/drawing.h"
 #include "display/drawing-context.h"
 #include "display/drawing-image.h"
 #include "preferences.h"
 #include "style.h"
 
+#include "display/cairo-utils.h"
+
 namespace Inkscape {
 
 DrawingImage::DrawingImage(Drawing &drawing)
diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp
index 94b8a871f..56507bacb 100644
--- a/src/display/drawing-item.cpp
+++ b/src/display/drawing-item.cpp
@@ -10,8 +10,7 @@
  */
 
 #include <climits>
-#include "display/cairo-utils.h"
-#include "display/cairo-templates.h"
+
 #include "display/drawing.h"
 #include "display/drawing-context.h"
 #include "display/drawing-item.h"
@@ -21,6 +20,9 @@
 #include "preferences.h"
 #include "style.h"
 
+#include "display/cairo-utils.h"
+#include "display/cairo-templates.h"
+
 namespace Inkscape {
 
 void set_cairo_blend_operator( DrawingContext &dc, unsigned blend_mode ) {
diff --git a/src/display/drawing-shape.cpp b/src/display/drawing-shape.cpp
index 1a41bdb3a..88506f2b9 100644
--- a/src/display/drawing-shape.cpp
+++ b/src/display/drawing-shape.cpp
@@ -9,7 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
+#include <glibmm.h>
 #include <2geom/curves.h>
 #include <2geom/pathvector.h>
 #include <2geom/path-sink.h>
diff --git a/src/display/drawing-text.cpp b/src/display/drawing-text.cpp
index 9f3b447df..97a8c23d3 100644
--- a/src/display/drawing-text.cpp
+++ b/src/display/drawing-text.cpp
@@ -9,8 +9,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "display/cairo-utils.h"
-#include "display/canvas-bpath.h" // for SPWindRule (WTF!)
+//#include "display/cairo-utils.h"
+//#include "display/canvas-bpath.h" // for SPWindRule (WTF!)
 #include "display/drawing.h"
 #include "display/drawing-context.h"
 #include "display/drawing-surface.h"
@@ -20,6 +20,9 @@
 #include "style.h"
 #include "2geom/pathvector.h"
 
+#include "display/cairo-utils.h"
+#include "display/canvas-bpath.h"
+
 namespace Inkscape {
 
 
diff --git a/src/display/drawing.h b/src/display/drawing.h
index cc74833ba..88e35b03b 100644
--- a/src/display/drawing.h
+++ b/src/display/drawing.h
@@ -13,7 +13,6 @@
 #define SEEN_INKSCAPE_DISPLAY_DRAWING_H
 
 #include <set>
-#include <glib.h>
 #include <boost/operators.hpp>
 #include <boost/utility.hpp>
 #include <sigc++/sigc++.h>
@@ -23,7 +22,7 @@
 #include "nr-filter-colormatrix.h"
 
 typedef struct _SPCanvasArena SPCanvasArena;
-
+typedef unsigned int guint32;
 
 namespace Inkscape {
 
@@ -65,7 +64,7 @@ public:
 
     OutlineColors const &colors() const { return _colors; }
 
-    void setGrayscaleMatrix(gdouble value_matrix[20]);
+    void setGrayscaleMatrix(double value_matrix[20]);
 
     void update(Geom::IntRect const &area = Geom::IntRect::infinite(), UpdateContext const &ctx = UpdateContext(), unsigned flags = DrawingItem::STATE_ALL, unsigned reset = 0);
     void render(DrawingContext &dc, Geom::IntRect const &area, unsigned flags = 0);
@@ -100,7 +99,7 @@ private:
 
     OutlineColors _colors;
     Filters::FilterColorMatrix::ColorMatrixMatrix _grayscale_colormatrix;
-    SPCanvasArena *_canvasarena; // may be NULL is this arena is not the screen
+    SPCanvasArena *_canvasarena; // may be NULL if this arena is not the screen
                                  // but used for export etc.
 
     friend class DrawingItem;
diff --git a/src/display/gnome-canvas-acetate.cpp b/src/display/gnome-canvas-acetate.cpp
index 2cd0f296d..9147a1bbf 100644
--- a/src/display/gnome-canvas-acetate.cpp
+++ b/src/display/gnome-canvas-acetate.cpp
@@ -15,40 +15,17 @@
 
 #include "gnome-canvas-acetate.h"
 
-static void sp_canvas_acetate_class_init (SPCanvasAcetateClass *klass);
-static void sp_canvas_acetate_init (SPCanvasAcetate *acetate);
 static void sp_canvas_acetate_destroy(SPCanvasItem *object);
 
 static void sp_canvas_acetate_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags);
 static double sp_canvas_acetate_point (SPCanvasItem *item, Geom::Point p, SPCanvasItem **actual_item);
 
-static SPCanvasItemClass *parent_class;
-
-GType sp_canvas_acetate_get_type (void)
-{
-	static GType acetate_type = 0;
-	if (!acetate_type) {
-		GTypeInfo acetate_info = {
-			sizeof (SPCanvasAcetateClass),
-			NULL, NULL,
-			(GClassInitFunc) sp_canvas_acetate_class_init,
-			NULL, NULL,
-			sizeof (SPCanvasAcetate),
-			0,
-			(GInstanceInitFunc) sp_canvas_acetate_init,
-			NULL
-		};
-		acetate_type = g_type_register_static(SPCanvasItem::getType(), "SPCanvasAcetate", &acetate_info, GTypeFlags(0));
-	}
-	return acetate_type;
-}
+G_DEFINE_TYPE(SPCanvasAcetate, sp_canvas_acetate, SP_TYPE_CANVAS_ITEM);
 
 static void sp_canvas_acetate_class_init (SPCanvasAcetateClass *klass)
 {
 	SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass;
 
-	parent_class = (SPCanvasItemClass*)g_type_class_peek_parent (klass);
-
 	item_class->destroy = sp_canvas_acetate_destroy;
 	item_class->update = sp_canvas_acetate_update;
 	item_class->point = sp_canvas_acetate_point;
@@ -64,8 +41,8 @@ static void sp_canvas_acetate_destroy(SPCanvasItem *object)
 	g_return_if_fail (object != NULL);
 	g_return_if_fail (GNOME_IS_CANVAS_ACETATE (object));
 
-	if (SP_CANVAS_ITEM_CLASS(parent_class)->destroy)
-		(* SP_CANVAS_ITEM_CLASS(parent_class)->destroy) (object);
+	if (SP_CANVAS_ITEM_CLASS(sp_canvas_acetate_parent_class)->destroy)
+	    SP_CANVAS_ITEM_CLASS(sp_canvas_acetate_parent_class)->destroy(object);
 }
 
 static void sp_canvas_acetate_update( SPCanvasItem *item, Geom::Affine const &/*affine*/, unsigned int /*flags*/ )
diff --git a/src/display/guideline.cpp b/src/display/guideline.cpp
index 55c1ee495..44bbd14bd 100644
--- a/src/display/guideline.cpp
+++ b/src/display/guideline.cpp
@@ -29,8 +29,6 @@
 
 using Inkscape::ControlManager;
 
-static void sp_guideline_class_init(SPGuideLineClass *c);
-static void sp_guideline_init(SPGuideLine *guideline);
 static void sp_guideline_destroy(SPCanvasItem *object);
 
 static void sp_guideline_update(SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags);
@@ -40,34 +38,10 @@ static double sp_guideline_point(SPCanvasItem *item, Geom::Point p, SPCanvasItem
 
 static void sp_guideline_drawline (SPCanvasBuf *buf, gint x0, gint y0, gint x1, gint y1, guint32 rgba);
 
-static SPCanvasItemClass *parent_class;
-
-GType sp_guideline_get_type()
-{
-    static GType guideline_type = 0;
-
-    if (!guideline_type) {
-        static GTypeInfo const guideline_info = {
-            sizeof (SPGuideLineClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_guideline_class_init,
-            NULL, NULL,
-            sizeof (SPGuideLine),
-            16,
-            (GInstanceInitFunc) sp_guideline_init,
-            NULL,
-        };
-
-        guideline_type = g_type_register_static(SP_TYPE_CANVAS_ITEM, "SPGuideLine", &guideline_info, (GTypeFlags) 0);
-    }
-
-    return guideline_type;
-}
+G_DEFINE_TYPE(SPGuideLine, sp_guideline, SP_TYPE_CANVAS_ITEM);
 
 static void sp_guideline_class_init(SPGuideLineClass *c)
 {
-    parent_class = SP_CANVAS_ITEM_CLASS(g_type_class_peek_parent(c));
-
     SPCanvasItemClass *item_class = SP_CANVAS_ITEM_CLASS(c);
     item_class->destroy = sp_guideline_destroy;
     item_class->update = sp_guideline_update;
@@ -108,7 +82,7 @@ static void sp_guideline_destroy(SPCanvasItem *object)
         g_free(gl->label);
     }
 
-    SP_CANVAS_ITEM_CLASS(parent_class)->destroy(object);
+    SP_CANVAS_ITEM_CLASS(sp_guideline_parent_class)->destroy(object);
 }
 
 static void sp_guideline_render(SPCanvasItem *item, SPCanvasBuf *buf)
@@ -197,8 +171,8 @@ static void sp_guideline_update(SPCanvasItem *item, Geom::Affine const &affine,
 {
     SPGuideLine *gl = SP_GUIDELINE(item);
 
-    if ((SP_CANVAS_ITEM_CLASS(parent_class))->update) {
-        (SP_CANVAS_ITEM_CLASS(parent_class))->update(item, affine, flags);
+    if ((SP_CANVAS_ITEM_CLASS(sp_guideline_parent_class))->update) {
+        (SP_CANVAS_ITEM_CLASS(sp_guideline_parent_class))->update(item, affine, flags);
     }
 
     gl->affine = affine;
diff --git a/src/display/nr-filter-blend.cpp b/src/display/nr-filter-blend.cpp
index 25aea6f13..d0db6b42e 100644
--- a/src/display/nr-filter-blend.cpp
+++ b/src/display/nr-filter-blend.cpp
@@ -20,6 +20,7 @@
 #include "config.h"
 #endif
 
+#include <glibmm.h>
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
 #include "display/nr-filter-blend.h"
diff --git a/src/display/nr-filter-primitive.h b/src/display/nr-filter-primitive.h
index 214b2cfc5..62f350844 100644
--- a/src/display/nr-filter-primitive.h
+++ b/src/display/nr-filter-primitive.h
@@ -11,6 +11,7 @@
 #ifndef SEEN_NR_FILTER_PRIMITIVE_H
 #define SEEN_NR_FILTER_PRIMITIVE_H
 
+#include <glib.h>
 #include <2geom/forward.h>
 #include <2geom/rect.h>
 #include "display/nr-filter-types.h"
diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp
index 90b233fbc..dec5b1f57 100644
--- a/src/display/nr-filter.cpp
+++ b/src/display/nr-filter.cpp
@@ -9,7 +9,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "display/nr-filter-image.h"
 #include <glib.h>
 #include <cmath>
 #include <cstring>
@@ -29,6 +28,7 @@
 #include "display/nr-filter-component-transfer.h"
 #include "display/nr-filter-diffuselighting.h"
 #include "display/nr-filter-displacement-map.h"
+#include "display/nr-filter-image.h"
 #include "display/nr-filter-flood.h"
 #include "display/nr-filter-gaussian.h"
 #include "display/nr-filter-merge.h"
diff --git a/src/display/sodipodi-ctrl.cpp b/src/display/sodipodi-ctrl.cpp
index 3636319df..327fbce1f 100644
--- a/src/display/sodipodi-ctrl.cpp
+++ b/src/display/sodipodi-ctrl.cpp
@@ -25,9 +25,6 @@ enum {
     ARG_PIXBUF
 };
 
-
-static void sp_ctrl_class_init (SPCtrlClass *klass);
-static void sp_ctrl_init (SPCtrl *ctrl);
 static void sp_ctrl_destroy(SPCanvasItem *object);
 static void sp_ctrl_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void sp_ctrl_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
@@ -36,29 +33,7 @@ static void sp_ctrl_render (SPCanvasItem *item, SPCanvasBuf *buf);
 
 static double sp_ctrl_point (SPCanvasItem *item, Geom::Point p, SPCanvasItem **actual_item);
 
-static SPCanvasItemClass *parent_class;
-
-GType
-sp_ctrl_get_type (void)
-{
-    static GType ctrl_type = 0;
-    if (!ctrl_type) {
-        static GTypeInfo const ctrl_info = {
-            sizeof (SPCtrlClass),
-            NULL,   /* base_init */
-            NULL,   /* base_finalize */
-            (GClassInitFunc) sp_ctrl_class_init,
-            NULL,   /* class_finalize */
-            NULL,   /* class_data */
-            sizeof (SPCtrl),
-            0,   /* n_preallocs */
-            (GInstanceInitFunc) sp_ctrl_init,
-            NULL
-        };
-        ctrl_type = g_type_register_static (SP_TYPE_CANVAS_ITEM, "SPCtrl", &ctrl_info, (GTypeFlags)0);
-    }
-    return ctrl_type;
-}
+G_DEFINE_TYPE(SPCtrl, sp_ctrl, SP_TYPE_CANVAS_ITEM);
 
 static void
 sp_ctrl_class_init (SPCtrlClass *klass)
@@ -66,8 +41,6 @@ sp_ctrl_class_init (SPCtrlClass *klass)
     SPCanvasItemClass *item_class = SP_CANVAS_ITEM_CLASS(klass);
     GObjectClass *g_object_class = (GObjectClass *) klass;
 
-    parent_class = SP_CANVAS_ITEM_CLASS(g_type_class_peek_parent (klass));
-
     g_object_class->set_property = sp_ctrl_set_property;
     g_object_class->get_property = sp_ctrl_get_property;
 
@@ -239,8 +212,8 @@ static void sp_ctrl_destroy(SPCanvasItem *object)
         ctrl->cache = NULL;
     }
 
-    if (SP_CANVAS_ITEM_CLASS(parent_class)->destroy)
-        (* SP_CANVAS_ITEM_CLASS(parent_class)->destroy) (object);
+    if (SP_CANVAS_ITEM_CLASS(sp_ctrl_parent_class)->destroy)
+        SP_CANVAS_ITEM_CLASS(sp_ctrl_parent_class)->destroy(object);
 }
 
 static void
@@ -251,8 +224,8 @@ sp_ctrl_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int fla
 
     ctrl = SP_CTRL (item);
 
-    if ((SP_CANVAS_ITEM_CLASS(parent_class))->update)
-        (* (SP_CANVAS_ITEM_CLASS(parent_class))->update) (item, affine, flags);
+    if (SP_CANVAS_ITEM_CLASS(sp_ctrl_parent_class)->update)
+        SP_CANVAS_ITEM_CLASS(sp_ctrl_parent_class)->update(item, affine, flags);
 
     sp_canvas_item_reset_bounds (item);
 
diff --git a/src/display/sodipodi-ctrlrect.cpp b/src/display/sodipodi-ctrlrect.cpp
index e6e427047..75789ff50 100644
--- a/src/display/sodipodi-ctrlrect.cpp
+++ b/src/display/sodipodi-ctrlrect.cpp
@@ -26,45 +26,19 @@
  * Corner coords can be in any order - i.e. x1 < x0 is allowed
  */
 
-static void sp_ctrlrect_class_init(SPCtrlRectClass *c);
-static void sp_ctrlrect_init(CtrlRect *ctrlrect);
 static void sp_ctrlrect_destroy(SPCanvasItem *object);
 
 static void sp_ctrlrect_update(SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags);
 static void sp_ctrlrect_render(SPCanvasItem *item, SPCanvasBuf *buf);
 
-static SPCanvasItemClass *parent_class;
-
 static const guint DASH_LENGTH = 4;
 
-GType sp_ctrlrect_get_type()
-{
-    static GType type = 0;
-
-    if (!type) {
-        GTypeInfo info = {
-            sizeof(SPCtrlRectClass),
-            0, // base_init
-            0, // base_finalize
-            (GClassInitFunc)sp_ctrlrect_class_init,
-            0, // class_finalize
-            0, // class_data
-            sizeof(CtrlRect),
-            0, // n_preallocs
-            (GInstanceInitFunc)sp_ctrlrect_init,
-            0 // value_table
-        };
-        type = g_type_register_static(SP_TYPE_CANVAS_ITEM, "SPCtrlRect", &info, static_cast<GTypeFlags>(0));
-    }
-    return type;
-}
+G_DEFINE_TYPE(CtrlRect, sp_ctrlrect, SP_TYPE_CANVAS_ITEM);
 
-static void sp_ctrlrect_class_init(SPCtrlRectClass *c)
+static void sp_ctrlrect_class_init(CtrlRectClass *c)
 {
     SPCanvasItemClass *item_class = SP_CANVAS_ITEM_CLASS(c);
 
-    parent_class = SP_CANVAS_ITEM_CLASS(g_type_class_peek_parent(c));
-
     item_class->destroy = sp_ctrlrect_destroy;
     item_class->update = sp_ctrlrect_update;
     item_class->render = sp_ctrlrect_render;
@@ -77,8 +51,8 @@ static void sp_ctrlrect_init(CtrlRect *cr)
 
 static void sp_ctrlrect_destroy(SPCanvasItem *object)
 {
-    if (SP_CANVAS_ITEM_CLASS(parent_class)->destroy) {
-        (* SP_CANVAS_ITEM_CLASS(parent_class)->destroy)(object);
+    if (SP_CANVAS_ITEM_CLASS(sp_ctrlrect_parent_class)->destroy) {
+        (* SP_CANVAS_ITEM_CLASS(sp_ctrlrect_parent_class)->destroy)(object);
     }
 }
 
@@ -171,8 +145,8 @@ void CtrlRect::update(Geom::Affine const &affine, unsigned int flags)
     using Geom::X;
     using Geom::Y;
 
-    if ((SP_CANVAS_ITEM_CLASS(parent_class))->update) {
-        (SP_CANVAS_ITEM_CLASS(parent_class))->update(this, affine, flags);
+    if ((SP_CANVAS_ITEM_CLASS(sp_ctrlrect_parent_class))->update) {
+        (SP_CANVAS_ITEM_CLASS(sp_ctrlrect_parent_class))->update(this, affine, flags);
     }
 
     sp_canvas_item_reset_bounds(this);
diff --git a/src/display/sodipodi-ctrlrect.h b/src/display/sodipodi-ctrlrect.h
index 65a40a850..ff6c55b06 100644
--- a/src/display/sodipodi-ctrlrect.h
+++ b/src/display/sodipodi-ctrlrect.h
@@ -26,7 +26,7 @@ struct SPCanvasBuf;
 
 #define SP_TYPE_CTRLRECT (sp_ctrlrect_get_type ())
 #define SP_CTRLRECT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SP_TYPE_CTRLRECT, CtrlRect))
-#define SP_CTRLRECT_CLASS(c) (G_TYPE_CHECK_CLASS_CAST((c), SP_TYPE_CTRLRECT, SPCtrlRectClass))
+#define SP_CTRLRECT_CLASS(c) (G_TYPE_CHECK_CLASS_CAST((c), SP_TYPE_CTRLRECT, CtrlRectClass))
 #define SP_IS_CTRLRECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_CTRLRECT))
 #define SP_IS_CTRLRECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_CTRLRECT))
 
@@ -57,7 +57,7 @@ private:
     int _shadow;
 };
 
-struct SPCtrlRectClass : public SPCanvasItemClass {};
+struct CtrlRectClass : public SPCanvasItemClass {};
 
 GType sp_ctrlrect_get_type();
 
diff --git a/src/display/sp-canvas-item.h b/src/display/sp-canvas-item.h
index f34ec453c..a388ffa91 100644
--- a/src/display/sp-canvas-item.h
+++ b/src/display/sp-canvas-item.h
@@ -24,8 +24,6 @@
 #endif
 
 #include <glib-object.h>
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
 #include <2geom/rect.h>
 #include "ui/control-types.h"
 
@@ -36,8 +34,10 @@ struct SPCanvasBuf;
 struct SPCanvasGroup;
 
 typedef struct _SPCanvasItemClass SPCanvasItemClass;
+typedef union  _GdkEvent          GdkEvent;
+typedef struct _GdkCursor         GdkCursor;
 
-#define SP_TYPE_CANVAS_ITEM (SPCanvasItem::getType())
+#define SP_TYPE_CANVAS_ITEM (sp_canvas_item_get_type())
 #define SP_CANVAS_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SP_TYPE_CANVAS_ITEM, SPCanvasItem))
 #define SP_CANVAS_ITEM_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), SP_TYPE_CANVAS_ITEM, SPCanvasItemClass))
 #define SP_IS_CANVAS_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_CANVAS_ITEM))
@@ -50,7 +50,6 @@ typedef struct _SPCanvasItemClass SPCanvasItemClass;
  */
 struct SPCanvasItem {
     GInitiallyUnowned parent_instance;
-    static GType getType();
 
     SPCanvas *canvas;
     SPCanvasItem *parent;
@@ -73,6 +72,8 @@ struct SPCanvasItem {
     bool in_destruction;
 };
 
+GType sp_canvas_item_get_type();
+
 /**
  * The vtable of an SPCanvasItem.
  */
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 3dc4a7504..305b0950a 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -61,8 +61,6 @@ struct SPCanvasGroupClass {
  * A group of Items.
  */
 struct SPCanvasGroup {
-    static GType getType();
-
     /**
      * Adds an item to a canvas group.
      */
@@ -113,17 +111,8 @@ struct SPCanvasGroup {
 
     GList *items;
     GList *last;
-
-    static SPCanvasItemClass *parentClass;
 };
 
-SPCanvasItemClass *SPCanvasGroup::parentClass;
-
-GType sp_canvas_group_get_type()
-{
-    return SPCanvasGroup::getType();
-}
-
 /**
  * The SPCanvas vtable.
  */
@@ -161,19 +150,6 @@ enum {
   LAST_SIGNAL
 };
 
-void sp_canvas_item_base_class_init(SPCanvasItemClass *klass);
-void sp_canvas_item_base_class_finalize(SPCanvasItemClass *klass);
-
-/**
- * Initializes the SPCanvasItem vtable and the "event" signal.
- */
-void sp_canvas_item_class_init(SPCanvasItemClass *klass);
-
-/**
- * Callback for initialization of SPCanvasItem.
- */
-void sp_canvas_item_init(SPCanvasItem *item, SPCanvasItemClass *klass);
-
 /**
  * Callback that removes item from all referers and destroys it.
  */
@@ -181,7 +157,6 @@ void sp_canvas_item_dispose(GObject           *object);
 void sp_canvas_item_finalize(GObject          *object);
 void sp_canvas_item_real_destroy(SPCanvasItem *object);
 
-static gpointer    parent_class = NULL;
 static guint       object_signals[LAST_SIGNAL] = { 0 };
 
 /**
@@ -358,45 +333,12 @@ public:
     static void requestCanvasUpdate(SPCanvas *canvas);
 };
 
-GType SPCanvasItem::getType()
-{
-    static GType object_type = 0;
-
-    if (!object_type) {
-        static GTypeInfo const object_info = {
-            sizeof(SPCanvasItemClass),
-	    reinterpret_cast<GBaseInitFunc>(sp_canvas_item_base_class_init),
-	    reinterpret_cast<GBaseFinalizeFunc>(sp_canvas_item_base_class_finalize),
-            reinterpret_cast<GClassInitFunc>(sp_canvas_item_class_init),
-            NULL, // class_finalize
-	    NULL, // class_data
-            sizeof(SPCanvasItem),
-            16, // n_preallocs
-            reinterpret_cast<GInstanceInitFunc>(sp_canvas_item_init),
-            NULL // value_table
-        };
-
-        object_type = g_type_register_static(G_TYPE_INITIALLY_UNOWNED, 
-                                             "SPCanvasItem", &object_info, GTypeFlags(0));
-    }
-
-    return object_type;
-}
-
-namespace {
-
-void sp_canvas_item_base_class_init(SPCanvasItemClass * /*klass*/)
-{
-}
-
-void sp_canvas_item_base_class_finalize(SPCanvasItemClass * /*klass*/)
-{
-}
+G_DEFINE_TYPE(SPCanvasItem, sp_canvas_item, G_TYPE_INITIALLY_UNOWNED);
 
-void sp_canvas_item_class_init(SPCanvasItemClass *klass)
+static void
+sp_canvas_item_class_init(SPCanvasItemClass *klass)
 {
     GObjectClass *gobject_class = (GObjectClass *) klass;
-    parent_class = g_type_class_ref (G_TYPE_OBJECT);
 
     item_signals[ITEM_EVENT] = g_signal_new ("event",
                                              G_TYPE_FROM_CLASS (klass),
@@ -421,7 +363,8 @@ void sp_canvas_item_class_init(SPCanvasItemClass *klass)
 		    G_TYPE_NONE, 0);
 }
 
-void sp_canvas_item_init(SPCanvasItem *item, SPCanvasItemClass * /*klass*/)
+static void
+sp_canvas_item_init(SPCanvasItem *item)
 {
     item->xform = Geom::Affine(Geom::identity());
     item->ctrlType = Inkscape::CTRL_TYPE_UNKNOWN;
@@ -434,15 +377,13 @@ void sp_canvas_item_init(SPCanvasItem *item, SPCanvasItemClass * /*klass*/)
     item->in_destruction = false;
 }
 
-} // namespace
-
 SPCanvasItem *sp_canvas_item_new(SPCanvasGroup *parent, GType type, gchar const *first_arg_name, ...)
 {
     va_list args;
 
     g_return_val_if_fail(parent != NULL, NULL);
     g_return_val_if_fail(SP_IS_CANVAS_GROUP(parent), NULL);
-    g_return_val_if_fail(g_type_is_a(type, SPCanvasItem::getType()), NULL);
+    g_return_val_if_fail(g_type_is_a(type, SP_TYPE_CANVAS_ITEM), NULL);
 
     SPCanvasItem *item = SP_CANVAS_ITEM(g_object_new(type, NULL));
 
@@ -554,7 +495,7 @@ void sp_canvas_item_dispose(GObject *object)
       item->in_destruction = false;
     }
 
-    G_OBJECT_CLASS(parent_class)->dispose(object);
+    G_OBJECT_CLASS(sp_canvas_item_parent_class)->dispose(object);
 }
 
 void sp_canvas_item_real_destroy(SPCanvasItem *object)
@@ -574,7 +515,7 @@ void sp_canvas_item_finalize(GObject *gobject)
 		 "and must be removed with g_object_ref_sink().");
     }
   
-  G_OBJECT_CLASS (parent_class)->finalize (gobject);
+  G_OBJECT_CLASS (sp_canvas_item_parent_class)->finalize (gobject);
 }
 } // namespace
 
@@ -982,37 +923,12 @@ gint sp_canvas_item_order (SPCanvasItem * item)
 }
 
 // SPCanvasGroup
+G_DEFINE_TYPE(SPCanvasGroup, sp_canvas_group, SP_TYPE_CANVAS_ITEM);
 
-/**
- * Registers SPCanvasGroup class with Gtk and returns its type number.
- */
-GType SPCanvasGroup::getType(void)
-{
-    static GType type = 0;
-    if (!type) {
-        GTypeInfo info = {
-            sizeof(SPCanvasGroupClass),
-            0, // base_init
-            0, // base_finalize
-            reinterpret_cast<GClassInitFunc>(SPCanvasGroup::classInit),
-            0, // class_finalize
-            0, // class_data
-            sizeof(SPCanvasGroup),
-            0, // n_preallocs
-            reinterpret_cast<GInstanceInitFunc>(SPCanvasGroup::init),
-            0 // value_table
-        };
-        type = g_type_register_static(SPCanvasItem::getType(), "SPCanvasGroup", &info, static_cast<GTypeFlags>(0));
-    }
-    return type;
-}
-
-void SPCanvasGroup::classInit(SPCanvasGroupClass *klass)
+static void sp_canvas_group_class_init(SPCanvasGroupClass *klass)
 {
     SPCanvasItemClass *item_class = reinterpret_cast<SPCanvasItemClass *>(klass);
 
-    parentClass = reinterpret_cast<SPCanvasItemClass*>(g_type_class_peek_parent(klass));
-
     item_class->destroy = SPCanvasGroup::destroy;
     item_class->update = SPCanvasGroup::update;
     item_class->render = SPCanvasGroup::render;
@@ -1020,7 +936,7 @@ void SPCanvasGroup::classInit(SPCanvasGroupClass *klass)
     item_class->viewbox_changed = SPCanvasGroup::viewboxChanged;
 }
 
-void SPCanvasGroup::init(SPCanvasGroup * /*group*/)
+static void sp_canvas_group_init(SPCanvasGroup * /*group*/)
 {
     // Nothing here
 }
@@ -1040,8 +956,8 @@ void SPCanvasGroup::destroy(SPCanvasItem *object)
         sp_canvas_item_destroy(child);
     }
 
-    if (SP_CANVAS_ITEM_CLASS(parentClass)->destroy) {
-        (* SP_CANVAS_ITEM_CLASS(parentClass)->destroy)(object);
+    if (SP_CANVAS_ITEM_CLASS(sp_canvas_group_parent_class)->destroy) {
+        (* SP_CANVAS_ITEM_CLASS(sp_canvas_group_parent_class)->destroy)(object);
     }
 }
 
@@ -1238,7 +1154,7 @@ sp_canvas_init(SPCanvas *canvas)
     canvas->pick_event.crossing.y = 0;
 
     // Create the root item as a special case
-    canvas->root = SP_CANVAS_ITEM(g_object_new(SPCanvasGroup::getType(), NULL));
+    canvas->root = SP_CANVAS_ITEM(g_object_new(SP_TYPE_CANVAS_GROUP, NULL));
     canvas->root->canvas = canvas;
 
     g_object_ref (canvas->root);
diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h
index 72ae4b6bc..adae30f35 100644
--- a/src/display/sp-canvas.h
+++ b/src/display/sp-canvas.h
@@ -30,7 +30,6 @@
 # endif
 #endif
 
-#include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <glibmm/ustring.h>
diff --git a/src/display/sp-ctrlcurve.cpp b/src/display/sp-ctrlcurve.cpp
index d9b687f2e..2e0e8105b 100644
--- a/src/display/sp-ctrlcurve.cpp
+++ b/src/display/sp-ctrlcurve.cpp
@@ -23,42 +23,18 @@
 
 namespace {
 
-static void sp_ctrlcurve_class_init(SPCtrlCurveClass *klass, gpointer data);
-static void sp_ctrlcurve_init(SPCtrlCurve *ctrlcurve, gpointer g_class);
 static void sp_ctrlcurve_destroy(SPCanvasItem *object);
 
 static void sp_ctrlcurve_update(SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags);
 static void sp_ctrlcurve_render(SPCanvasItem *item, SPCanvasBuf *buf);
 
-static SPCanvasItemClass *parent_class;
-
 } // namespace
 
-GType SPCtrlCurve::getType()
-{
-    static GType type = 0;
-    if (!type) {
-        GTypeInfo info = {
-            sizeof(SPCtrlCurveClass),
-            NULL, NULL,
-            reinterpret_cast<GClassInitFunc>(sp_ctrlcurve_class_init),
-            NULL, NULL,
-            sizeof(SPCtrlCurve),
-            0,
-            reinterpret_cast<GInstanceInitFunc>(sp_ctrlcurve_init),
-            NULL
-        };
-        type = g_type_register_static(SP_TYPE_CANVAS_ITEM, "SPCtrlCurve", &info, static_cast<GTypeFlags>(0));
-    }
-    return type;
-}
+G_DEFINE_TYPE(SPCtrlCurve, sp_ctrlcurve, SP_TYPE_CANVAS_ITEM);
 
-namespace {
-
-void sp_ctrlcurve_class_init(SPCtrlCurveClass *klass, gpointer /*g_class*/)
+static void
+sp_ctrlcurve_class_init(SPCtrlCurveClass *klass)
 {
-    parent_class = reinterpret_cast<SPCanvasItemClass*>(g_type_class_peek_parent(klass));
-
     klass->destroy = sp_ctrlcurve_destroy;
 
     klass->update = sp_ctrlcurve_update;
@@ -66,13 +42,14 @@ void sp_ctrlcurve_class_init(SPCtrlCurveClass *klass, gpointer /*g_class*/)
 }
 
 static void
-sp_ctrlcurve_init(SPCtrlCurve *ctrlcurve, gpointer /*g_class*/)
+sp_ctrlcurve_init(SPCtrlCurve *ctrlcurve)
 {
     // Points are initialized to 0,0
     ctrlcurve->rgba = 0x0000ff7f;
     ctrlcurve->item=NULL;
 }
 
+namespace {
 static void
 sp_ctrlcurve_destroy(SPCanvasItem *object)
 {
@@ -83,8 +60,8 @@ sp_ctrlcurve_destroy(SPCanvasItem *object)
 
     ctrlcurve->item=NULL;
 
-    if (SP_CANVAS_ITEM_CLASS (parent_class)->destroy)
-        (* SP_CANVAS_ITEM_CLASS (parent_class)->destroy) (object);
+    if (SP_CANVAS_ITEM_CLASS(sp_ctrlcurve_parent_class)->destroy)
+        SP_CANVAS_ITEM_CLASS(sp_ctrlcurve_parent_class)->destroy(object);
 }
 
 static void
@@ -125,8 +102,8 @@ sp_ctrlcurve_update(SPCanvasItem *item, Geom::Affine const &affine, unsigned int
 
     item->canvas->requestRedraw(item->x1, item->y1, item->x2, item->y2);
 
-    if (parent_class->update)
-        (* parent_class->update) (item, affine, flags);
+    if (SP_CANVAS_ITEM_CLASS(sp_ctrlcurve_parent_class)->update)
+        SP_CANVAS_ITEM_CLASS(sp_ctrlcurve_parent_class)->update(item, affine, flags);
 
     sp_canvas_item_reset_bounds (item);
 
diff --git a/src/display/sp-ctrlcurve.h b/src/display/sp-ctrlcurve.h
index 90936185c..847944f38 100644
--- a/src/display/sp-ctrlcurve.h
+++ b/src/display/sp-ctrlcurve.h
@@ -19,14 +19,11 @@
 
 class SPItem;
 
-#define SP_TYPE_CTRLCURVE (SPCtrlCurve::getType())
+#define SP_TYPE_CTRLCURVE (sp_ctrlcurve_get_type())
 #define SP_CTRLCURVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_CTRLCURVE, SPCtrlCurve))
 #define SP_IS_CTRLCURVE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_CTRLCURVE))
 
 struct SPCtrlCurve : public SPCtrlLine {
-
-    static GType getType();
-
     void setCoords( gdouble x0, gdouble y0, gdouble x1, gdouble y1,
                     gdouble x2, gdouble y2, gdouble x3, gdouble y3 );
 
@@ -36,9 +33,9 @@ struct SPCtrlCurve : public SPCtrlLine {
     Geom::Point p0, p1, p2, p3;
 };
 
-struct SPCtrlCurveClass : public SPCtrlLineClass{};
-
+GType sp_ctrlcurve_get_type();
 
+struct SPCtrlCurveClass : public SPCtrlLineClass{};
 
 #endif // SEEN_INKSCAPE_CTRLCURVE_H
 
diff --git a/src/display/sp-ctrlline.cpp b/src/display/sp-ctrlline.cpp
index aef284c1a..1bde540c0 100644
--- a/src/display/sp-ctrlline.cpp
+++ b/src/display/sp-ctrlline.cpp
@@ -30,55 +30,31 @@
 
 namespace {
 
-void sp_ctrlline_class_init(SPCtrlLineClass *klass, gpointer data);
-void sp_ctrlline_init(SPCtrlLine *ctrlline, gpointer g_class);
 void sp_ctrlline_destroy(SPCanvasItem *object);
 
 void sp_ctrlline_update(SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags);
 void sp_ctrlline_render(SPCanvasItem *item, SPCanvasBuf *buf);
 
-SPCanvasItemClass *parent_class = 0;
-
 } // namespace
 
-GType SPCtrlLine::getType()
-{
-    static GType type = 0;
-    if (!type) {
-        GTypeInfo info = {
-            sizeof(SPCtrlLineClass),
-            NULL, NULL,
-            reinterpret_cast<GClassInitFunc>(sp_ctrlline_class_init),
-            NULL, NULL,
-            sizeof(SPCtrlLine),
-            0,
-            reinterpret_cast<GInstanceInitFunc>(sp_ctrlline_init),
-            NULL
-        };
-        type = g_type_register_static(SP_TYPE_CANVAS_ITEM, "SPCtrlLine", &info, static_cast<GTypeFlags>(0));
-    }
-    return type;
-}
-
-namespace {
+G_DEFINE_TYPE(SPCtrlLine, sp_ctrlline, SP_TYPE_CANVAS_ITEM);
 
-void sp_ctrlline_class_init(SPCtrlLineClass *klass, gpointer /*data*/)
+static void sp_ctrlline_class_init(SPCtrlLineClass *klass)
 {
-    parent_class = reinterpret_cast<SPCanvasItemClass*>(g_type_class_peek_parent(klass));
-
     klass->destroy = sp_ctrlline_destroy;
 
     klass->update = sp_ctrlline_update;
     klass->render = sp_ctrlline_render;
 }
 
-void sp_ctrlline_init(SPCtrlLine *ctrlline, gpointer /*g_class*/)
+static void sp_ctrlline_init(SPCtrlLine *ctrlline)
 {
     ctrlline->rgba = 0x0000ff7f;
     ctrlline->s[Geom::X] = ctrlline->s[Geom::Y] = ctrlline->e[Geom::X] = ctrlline->e[Geom::Y] = 0.0;
     ctrlline->item=NULL;
 }
 
+namespace {
 void sp_ctrlline_destroy(SPCanvasItem *object)
 {
     g_return_if_fail(object != NULL);
@@ -88,8 +64,8 @@ void sp_ctrlline_destroy(SPCanvasItem *object)
 
     ctrlline->item = NULL;
 
-    if(SP_CANVAS_ITEM_CLASS (parent_class)->destroy) {
-        (* SP_CANVAS_ITEM_CLASS (parent_class)->destroy)(object);
+    if(SP_CANVAS_ITEM_CLASS (sp_ctrlline_parent_class)->destroy) {
+       SP_CANVAS_ITEM_CLASS (sp_ctrlline_parent_class)->destroy(object);
     }
 }
 
@@ -134,8 +110,8 @@ void sp_ctrlline_update(SPCanvasItem *item, Geom::Affine const &affine, unsigned
 
     item->canvas->requestRedraw(item->x1, item->y1, item->x2, item->y2);
 
-    if (parent_class->update) {
-        (* parent_class->update)(item, affine, flags);
+    if (SP_CANVAS_ITEM_CLASS(sp_ctrlline_parent_class)->update) {
+        SP_CANVAS_ITEM_CLASS(sp_ctrlline_parent_class)->update(item, affine, flags);
     }
 
     sp_canvas_item_reset_bounds(item);
diff --git a/src/display/sp-ctrlline.h b/src/display/sp-ctrlline.h
index 12be03ca5..b2e222437 100644
--- a/src/display/sp-ctrlline.h
+++ b/src/display/sp-ctrlline.h
@@ -20,13 +20,11 @@
 
 class SPItem;
 
-#define SP_TYPE_CTRLLINE (SPCtrlLine::getType())
+#define SP_TYPE_CTRLLINE (sp_ctrlline_get_type())
 #define SP_CTRLLINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_CTRLLINE, SPCtrlLine))
 #define SP_IS_CTRLLINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_CTRLLINE))
 
 struct SPCtrlLine : public SPCanvasItem {
-    static GType getType();
-
     void setRgba32(guint32 rgba);
 
     void setCoords(gdouble x0, gdouble y0, gdouble x1, gdouble y1);
@@ -41,6 +39,8 @@ struct SPCtrlLine : public SPCanvasItem {
     Geom::Affine affine;
 };
 
+GType sp_ctrlline_get_type();
+
 struct SPCtrlLineClass : public SPCanvasItemClass{};
 
 
diff --git a/src/display/sp-ctrlpoint.cpp b/src/display/sp-ctrlpoint.cpp
index 026cc7589..1082cb1b3 100644
--- a/src/display/sp-ctrlpoint.cpp
+++ b/src/display/sp-ctrlpoint.cpp
@@ -20,42 +20,17 @@
 #include "display/cairo-utils.h"
 #include "display/sp-canvas.h"
 
-
-static void sp_ctrlpoint_class_init (SPCtrlPointClass *klass);
-static void sp_ctrlpoint_init (SPCtrlPoint *ctrlpoint);
 static void sp_ctrlpoint_destroy(SPCanvasItem *object);
 
 static void sp_ctrlpoint_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags);
 static void sp_ctrlpoint_render (SPCanvasItem *item, SPCanvasBuf *buf);
 
-static SPCanvasItemClass *parent_class;
-
-GType
-sp_ctrlpoint_get_type (void)
-{
-    static GType type = 0;
-    if (!type) {
-        GTypeInfo info = {
-            sizeof(SPCtrlPointClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_ctrlpoint_class_init,
-            NULL, NULL,
-            sizeof(SPCtrlPoint),
-            0,
-            (GInstanceInitFunc) sp_ctrlpoint_init,
-            NULL
-        };
-        type = g_type_register_static(SP_TYPE_CANVAS_ITEM, "SPCtrlPoint", &info, (GTypeFlags)0);
-    }
-    return type;
-}
+G_DEFINE_TYPE(SPCtrlPoint, sp_ctrlpoint, SP_TYPE_CANVAS_ITEM);
 
 static void sp_ctrlpoint_class_init(SPCtrlPointClass *klass)
 {
     SPCanvasItemClass *item_class = SP_CANVAS_ITEM_CLASS(klass);
 
-    parent_class = SP_CANVAS_ITEM_CLASS(g_type_class_peek_parent(klass));
-
     item_class->destroy = sp_ctrlpoint_destroy;
     item_class->update = sp_ctrlpoint_update;
     item_class->render = sp_ctrlpoint_render;
@@ -79,8 +54,8 @@ static void sp_ctrlpoint_destroy(SPCanvasItem *object)
 
     ctrlpoint->item=NULL;
 
-    if (SP_CANVAS_ITEM_CLASS(parent_class)->destroy)
-        (* SP_CANVAS_ITEM_CLASS(parent_class)->destroy) (object);
+    if (SP_CANVAS_ITEM_CLASS(sp_ctrlpoint_parent_class)->destroy)
+        SP_CANVAS_ITEM_CLASS(sp_ctrlpoint_parent_class)->destroy(object);
 }
 
 static void
@@ -111,8 +86,8 @@ static void sp_ctrlpoint_update(SPCanvasItem *item, Geom::Affine const &affine,
 
     item->canvas->requestRedraw((int)item->x1, (int)item->y1, (int)item->x2, (int)item->y2);
 
-    if (parent_class->update) {
-        (* parent_class->update) (item, affine, flags);
+    if (SP_CANVAS_ITEM_CLASS(sp_ctrlpoint_parent_class)->update) {
+        SP_CANVAS_ITEM_CLASS(sp_ctrlpoint_parent_class)->update(item, affine, flags);
     }
 
     sp_canvas_item_reset_bounds (item);
diff --git a/src/display/sp-ctrlquadr.cpp b/src/display/sp-ctrlquadr.cpp
index b6a0da109..760e93a6d 100644
--- a/src/display/sp-ctrlquadr.cpp
+++ b/src/display/sp-ctrlquadr.cpp
@@ -29,42 +29,18 @@ struct SPCtrlQuadr : public SPCanvasItem{
 
 struct SPCtrlQuadrClass : public SPCanvasItemClass{};
 
-static void sp_ctrlquadr_class_init (SPCtrlQuadrClass *klass);
-static void sp_ctrlquadr_init (SPCtrlQuadr *ctrlquadr);
 static void sp_ctrlquadr_destroy(SPCanvasItem *object);
 
 static void sp_ctrlquadr_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags);
 static void sp_ctrlquadr_render (SPCanvasItem *item, SPCanvasBuf *buf);
 
-static SPCanvasItemClass *parent_class;
-
-GType
-sp_ctrlquadr_get_type (void)
-{
-    static GType type = 0;
-    if (!type) {
-        GTypeInfo info = {
-            sizeof(SPCtrlQuadrClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_ctrlquadr_class_init,
-            NULL, NULL,
-            sizeof(SPCtrlQuadr),
-            0,
-            (GInstanceInitFunc) sp_ctrlquadr_init,
-            NULL
-        };
-        type = g_type_register_static(SP_TYPE_CANVAS_ITEM, "SPCtrlQuadr", &info, (GTypeFlags)0);
-    }
-    return type;
-}
+G_DEFINE_TYPE(SPCtrlQuadr, sp_ctrlquadr, SP_TYPE_CANVAS_ITEM);
 
 static void
 sp_ctrlquadr_class_init (SPCtrlQuadrClass *klass)
 {
     SPCanvasItemClass *item_class = SP_CANVAS_ITEM_CLASS(klass);
 
-    parent_class = SP_CANVAS_ITEM_CLASS(g_type_class_peek_parent(klass));
-
     item_class->destroy = sp_ctrlquadr_destroy;
     item_class->update = sp_ctrlquadr_update;
     item_class->render = sp_ctrlquadr_render;
@@ -85,8 +61,8 @@ static void sp_ctrlquadr_destroy(SPCanvasItem *object)
     g_return_if_fail (object != NULL);
     g_return_if_fail (SP_IS_CTRLQUADR (object));
 
-    if (SP_CANVAS_ITEM_CLASS(parent_class)->destroy)
-        (* SP_CANVAS_ITEM_CLASS(parent_class)->destroy) (object);
+    if (SP_CANVAS_ITEM_CLASS(sp_ctrlquadr_parent_class)->destroy)
+        (* SP_CANVAS_ITEM_CLASS(sp_ctrlquadr_parent_class)->destroy) (object);
 }
 
 static void
@@ -139,8 +115,8 @@ static void sp_ctrlquadr_update(SPCanvasItem *item, Geom::Affine const &affine,
 
     item->canvas->requestRedraw((int)item->x1, (int)item->y1, (int)item->x2, (int)item->y2);
 
-    if (parent_class->update) {
-        (* parent_class->update)(item, affine, flags);
+    if (SP_CANVAS_ITEM_CLASS(sp_ctrlquadr_parent_class)->update) {
+        SP_CANVAS_ITEM_CLASS(sp_ctrlquadr_parent_class)->update(item, affine, flags);
     }
 
     sp_canvas_item_reset_bounds (item);