merge from trunk (r12005)

(bzr r11668.1.47)

25 files changed, 1254 insertions, 795 deletions

diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index 1ac083276..d7be6c9f0 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -76,11 +76,11 @@ GType sp_button_get_type(void)
 static void
 sp_button_class_init (SPButtonClass *klass)
 {
-	GObjectClass *object_class=(GObjectClass *)klass;
-	GtkWidgetClass *widget_class=(GtkWidgetClass *)klass;
-	GtkButtonClass *button_class=(GtkButtonClass *)klass;
+	GObjectClass *object_class=G_OBJECT_CLASS(klass);
+	GtkWidgetClass *widget_class=GTK_WIDGET_CLASS(klass);
+	GtkButtonClass *button_class=GTK_BUTTON_CLASS(klass);
 
-	parent_class = (GtkToggleButtonClass *)g_type_class_peek_parent (klass);
+	parent_class = GTK_TOGGLE_BUTTON_CLASS(g_type_class_peek_parent(klass));
 
 	object_class->dispose = sp_button_dispose;
 #if GTK_CHECK_VERSION(3,0,0)
@@ -123,7 +123,7 @@ static void sp_button_dispose(GObject *object)
     button->c_set_active.~connection();
     button->c_set_sensitive.~connection();
 
-	((GObjectClass *) (parent_class))->dispose(object);
+	(G_OBJECT_CLASS(parent_class))->dispose(object);
 }
 
 
@@ -185,7 +185,7 @@ sp_button_clicked (GtkButton *button)
 	SPButton *sp_button=SP_BUTTON (button);
 
 	if (sp_button->type == SP_BUTTON_TYPE_TOGGLE) {
-		((GtkButtonClass *) (parent_class))->clicked (button);
+		(GTK_BUTTON_CLASS(parent_class))->clicked (button);
 	}
 }
 
@@ -230,7 +230,7 @@ sp_button_new( Inkscape::IconSize size, SPButtonType type, SPAction *action, SPA
 	// The Inkscape style is no-relief buttons
 	gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
 
-	return (GtkWidget *) button;
+	return GTK_WIDGET(button);
 }
 
 void
@@ -287,7 +287,7 @@ sp_button_set_action (SPButton *button, SPAction *action)
 		}
 	}
 
-	sp_button_set_composed_tooltip ((GtkWidget *) button, action);
+	sp_button_set_composed_tooltip(GTK_WIDGET(button), action);
 }
 
 static void
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 3791ec73c..a7432c32a 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -303,8 +303,8 @@ sp_desktop_widget_class_init (SPDesktopWidgetClass *klass)
 {
     dtw_parent_class = SP_VIEW_WIDGET_CLASS(g_type_class_peek_parent(klass));
 
-    GObjectClass *object_class = (GObjectClass *) klass;
-    GtkWidgetClass *widget_class = (GtkWidgetClass *) klass;
+    GObjectClass *object_class = G_OBJECT_CLASS(klass);
+    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
 
     object_class->dispose = sp_desktop_widget_dispose;
 
@@ -321,8 +321,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
 
     new (&dtw->modified_connection) sigc::connection();
 
-    GtkWidget *widget = GTK_WIDGET (dtw);
-
     dtw->window = 0;
     dtw->desktop = NULL;
     dtw->_interaction_disabled_counter = 0;
@@ -330,7 +328,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     /* Main table */
 #if GTK_CHECK_VERSION(3,0,0)
     dtw->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-    gtk_box_set_homogeneous(GTK_BOX(dtw->vbox), FALSE);
 #else
     dtw->vbox = gtk_vbox_new (FALSE, 0);
 #endif
@@ -338,7 +335,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
 
 #if GTK_CHECK_VERSION(3,0,0)
     dtw->statusbar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-    gtk_box_set_homogeneous(GTK_BOX(dtw->statusbar), FALSE);
 #else
     dtw->statusbar = gtk_hbox_new (FALSE, 0);
 #endif
@@ -355,7 +351,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
 
 #if GTK_CHECK_VERSION(3,0,0)
     dtw->hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-    gtk_box_set_homogeneous(GTK_BOX(dtw->hbox), FALSE);
 #else
     dtw->hbox = gtk_hbox_new(FALSE, 0);
 #endif
@@ -381,11 +376,9 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     GtkWidget *eventbox = gtk_event_box_new ();
     dtw->hruler = sp_ruler_new(GTK_ORIENTATION_HORIZONTAL);
     dtw->hruler_box = eventbox;
-    sp_ruler_set_metric(SP_RULER(dtw->hruler), SP_PT);
+    sp_ruler_set_unit(SP_RULER(dtw->hruler), SP_PT);
     gtk_widget_set_tooltip_text (dtw->hruler_box, gettext(sp_unit_get_plural (&sp_unit_get_by_id(SP_UNIT_PT))));
     gtk_container_add (GTK_CONTAINER (eventbox), dtw->hruler);
-    guint xthickness = gtk_widget_get_style(widget)->xthickness;
-    guint ythickness = gtk_widget_get_style(widget)->ythickness;
     g_signal_connect (G_OBJECT (eventbox), "button_press_event", G_CALLBACK (sp_dt_hruler_event), dtw);
     g_signal_connect (G_OBJECT (eventbox), "button_release_event", G_CALLBACK (sp_dt_hruler_event), dtw);
     g_signal_connect (G_OBJECT (eventbox), "motion_notify_event", G_CALLBACK (sp_dt_hruler_event), dtw);
@@ -394,21 +387,16 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     GtkWidget *tbl = gtk_grid_new();
     GtkWidget *canvas_tbl = gtk_grid_new();
     
-    gtk_widget_set_margin_left(eventbox, xthickness);
-    gtk_widget_set_margin_right(eventbox, xthickness);
-    
-    gtk_widget_set_halign(eventbox, GTK_ALIGN_FILL);
-    gtk_widget_set_hexpand(eventbox, TRUE);
-    gtk_widget_set_valign(eventbox, GTK_ALIGN_START);
-
     gtk_grid_attach(GTK_GRID(canvas_tbl), eventbox, 1, 0, 1, 1);
 #else
     GtkWidget *tbl = gtk_table_new(2, 3, FALSE);
     GtkWidget *canvas_tbl = gtk_table_new(3, 3, FALSE);
    
-    gtk_table_attach(GTK_TABLE (canvas_tbl), eventbox, 1, 2, 0, 1, 
-            GTK_FILL, GTK_FILL, 
-            xthickness, 0);
+    gtk_table_attach(GTK_TABLE(canvas_tbl),
+                     eventbox,
+                     1, 2,     0, 1, 
+		     GTK_FILL, GTK_FILL, 
+		     0,        0);
 #endif
 
     gtk_box_pack_start( GTK_BOX(dtw->hbox), tbl, TRUE, TRUE, 1 );
@@ -417,23 +405,18 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     eventbox = gtk_event_box_new ();
     dtw->vruler = sp_ruler_new(GTK_ORIENTATION_VERTICAL);
     dtw->vruler_box = eventbox;
-    sp_ruler_set_metric (SP_RULER (dtw->vruler), SP_PT);
+    sp_ruler_set_unit (SP_RULER (dtw->vruler), SP_PT);
     gtk_widget_set_tooltip_text (dtw->vruler_box, gettext(sp_unit_get_plural (&sp_unit_get_by_id(SP_UNIT_PT))));
     gtk_container_add (GTK_CONTAINER (eventbox), GTK_WIDGET (dtw->vruler));
 
 #if GTK_CHECK_VERSION(3,0,0)
-    gtk_widget_set_margin_top(eventbox, ythickness);
-    gtk_widget_set_margin_bottom(eventbox, ythickness);
-
-    gtk_widget_set_halign(eventbox, GTK_ALIGN_START);
-    gtk_widget_set_valign(eventbox, GTK_ALIGN_FILL);
-    gtk_widget_set_vexpand(eventbox, TRUE);
-
     gtk_grid_attach(GTK_GRID(canvas_tbl), eventbox, 0, 1, 1, 1);
 #else
-    gtk_table_attach(GTK_TABLE (canvas_tbl), eventbox, 0, 1, 1, 2,
-            GTK_FILL, GTK_FILL,
-            0, ythickness);
+    gtk_table_attach(GTK_TABLE (canvas_tbl),
+                     eventbox,
+		     0, 1,     1, 2,
+                     GTK_FILL, GTK_FILL,
+                     0,        0);
 #endif
 
     g_signal_connect (G_OBJECT (eventbox), "button_press_event", G_CALLBACK (sp_dt_vruler_event), dtw);
@@ -441,15 +424,12 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     g_signal_connect (G_OBJECT (eventbox), "motion_notify_event", G_CALLBACK (sp_dt_vruler_event), dtw);
 
     // Horizontal scrollbar
-    dtw->hadj = (GtkAdjustment *) gtk_adjustment_new (0.0, -4000.0, 4000.0, 10.0, 100.0, 4.0);
+    dtw->hadj = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, -4000.0, 4000.0, 10.0, 100.0, 4.0));
 
 #if GTK_CHECK_VERSION(3,0,0)
     dtw->hscrollbar = gtk_scrollbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (dtw->hadj));
-    gtk_widget_set_halign(dtw->hscrollbar, GTK_ALIGN_FILL);
-    gtk_widget_set_hexpand(dtw->hscrollbar, TRUE);
     gtk_grid_attach(GTK_GRID(canvas_tbl), dtw->hscrollbar, 1, 2, 1, 1);
     dtw->vscrollbar_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-    gtk_box_set_homogeneous(GTK_BOX(dtw->vscrollbar_box), FALSE);
 #else
     dtw->hscrollbar = gtk_hscrollbar_new (GTK_ADJUSTMENT (dtw->hadj));
     gtk_table_attach(GTK_TABLE (canvas_tbl), dtw->hscrollbar, 1, 2, 2, 3,
@@ -469,7 +449,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     g_signal_connect (G_OBJECT (dtw->sticky_zoom), "toggled", G_CALLBACK (sp_dtw_sticky_zoom_toggled), dtw);
 
     // Vertical scrollbar
-    dtw->vadj = (GtkAdjustment *) gtk_adjustment_new (0.0, -4000.0, 4000.0, 10.0, 100.0, 4.0);
+    dtw->vadj = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, -4000.0, 4000.0, 10.0, 100.0, 4.0));
 
 #if GTK_CHECK_VERSION(3,0,0)
     dtw->vscrollbar = gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, GTK_ADJUSTMENT(dtw->vadj));
@@ -480,8 +460,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     gtk_box_pack_start (GTK_BOX (dtw->vscrollbar_box), dtw->vscrollbar, TRUE, TRUE, 0);
 
 #if GTK_CHECK_VERSION(3,0,0)
-    gtk_widget_set_valign(dtw->vscrollbar, GTK_ALIGN_FILL);
-    gtk_widget_set_vexpand(dtw->vscrollbar, TRUE);
     gtk_grid_attach(GTK_GRID(canvas_tbl), dtw->vscrollbar_box, 2, 0, 1, 2);
 #else
     gtk_table_attach(GTK_TABLE(canvas_tbl), dtw->vscrollbar_box, 2, 3, 0, 2,
@@ -561,8 +539,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     g_signal_connect (G_OBJECT (dtw->canvas), "event", G_CALLBACK (sp_desktop_widget_event), dtw);
 
 #if GTK_CHECK_VERSION(3,0,0)
-    gtk_widget_set_halign(GTK_WIDGET(dtw->canvas), GTK_ALIGN_FILL);
-    gtk_widget_set_valign(GTK_WIDGET(dtw->canvas), GTK_ALIGN_FILL);
     gtk_widget_set_hexpand(GTK_WIDGET(dtw->canvas), TRUE);
     gtk_widget_set_vexpand(GTK_WIDGET(dtw->canvas), TRUE);
     gtk_grid_attach(GTK_GRID(canvas_tbl), GTK_WIDGET(dtw->canvas), 1, 1, 1, 1);
@@ -578,7 +554,12 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     if (create_dock) {
         dtw->dock = new Inkscape::UI::Widget::Dock();
 
+#if WITH_GTKMM_3_0
+        Gtk::Paned *paned = new Gtk::Paned();
+#else
         Gtk::HPaned *paned = new Gtk::HPaned();
+#endif
+
         paned->pack1(*Glib::wrap(canvas_tbl));
         paned->pack2(dtw->dock->getWidget(), Gtk::FILL);
 
@@ -591,8 +572,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
 #if GTK_CHECK_VERSION(3,0,0)
         gtk_widget_set_hexpand(GTK_WIDGET(paned->gobj()), TRUE);
         gtk_widget_set_vexpand(GTK_WIDGET(paned->gobj()), TRUE);
-        gtk_widget_set_halign(GTK_WIDGET(paned->gobj()), GTK_ALIGN_FILL);
-        gtk_widget_set_valign(GTK_WIDGET(paned->gobj()), GTK_ALIGN_FILL);
         gtk_grid_attach(GTK_GRID(tbl), GTK_WIDGET (paned->gobj()), 1, 1, 1, 1);
 #else
         gtk_table_attach (GTK_TABLE (tbl), GTK_WIDGET (paned->gobj()), 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
@@ -603,8 +582,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
 #if GTK_CHECK_VERSION(3,0,0)
         gtk_widget_set_hexpand(GTK_WIDGET(canvas_tbl), TRUE);
         gtk_widget_set_vexpand(GTK_WIDGET(canvas_tbl), TRUE);
-        gtk_widget_set_halign(GTK_WIDGET(canvas_tbl), GTK_ALIGN_FILL);
-        gtk_widget_set_valign(GTK_WIDGET(canvas_tbl), GTK_ALIGN_FILL);
         gtk_grid_attach(GTK_GRID(tbl), GTK_WIDGET (canvas_tbl), 1, 1, 1, 1);
 #else
         gtk_table_attach (GTK_TABLE (tbl), GTK_WIDGET (canvas_tbl), 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
@@ -811,7 +788,7 @@ static void sp_desktop_widget_dispose(GObject *object)
 void
 SPDesktopWidget::updateTitle(gchar const* uri)
 {
-    Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window");
+    Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window"));
 
     if (window) {
         gchar const *fname = uri;
@@ -1121,7 +1098,7 @@ SPDesktopWidget::shutdown()
             switch (response) {
             case GTK_RESPONSE_YES:
             {
-                Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window");
+                Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window"));
 
                 doc->doRef();
                 sp_namedview_document_from_window(desktop);
@@ -1185,7 +1162,7 @@ SPDesktopWidget::shutdown()
             {
                 doc->doRef();
 
-                Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window");
+                Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window"));
 
                 if (sp_file_save_dialog(*window, doc, Inkscape::Extension::FILE_SAVE_METHOD_INKSCAPE_SVG)) {
                     doc->doUnref();
@@ -1297,7 +1274,7 @@ SPDesktopWidget::getWindowGeometry (gint &x, gint &y, gint &w, gint &h)
     gboolean vis = gtk_widget_get_visible (GTK_WIDGET(this));
     (void)vis; // TODO figure out why it is here but not used.
 
-    Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window");
+    Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window"));
 
     if (window)
     {
@@ -1309,7 +1286,7 @@ SPDesktopWidget::getWindowGeometry (gint &x, gint &y, gint &w, gint &h)
 void
 SPDesktopWidget::setWindowPosition (Geom::Point p)
 {
-    Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window");
+    Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window"));
 
     if (window)
     {
@@ -1320,7 +1297,7 @@ SPDesktopWidget::setWindowPosition (Geom::Point p)
 void
 SPDesktopWidget::setWindowSize (gint w, gint h)
 {
-    Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window");
+    Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window"));
 
     if (window)
     {
@@ -1338,10 +1315,10 @@ SPDesktopWidget::setWindowSize (gint w, gint h)
 void
 SPDesktopWidget::setWindowTransient (void *p, int transient_policy)
 {
-    Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window");
+    Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window"));
     if (window)
     {
-        GtkWindow *w = (GtkWindow *) window->gobj();
+        GtkWindow *w = GTK_WINDOW(window->gobj());
         gtk_window_set_transient_for (GTK_WINDOW(p), w);
 
         /*
@@ -1586,7 +1563,7 @@ SPDesktopWidget::setToolboxSelectOneValue (gchar const *id, int value)
 {
     gpointer hb = sp_search_by_data_recursive(aux_toolbox, (gpointer) id);
     if (hb) {
-        ege_select_one_action_set_active((EgeSelectOneAction*) hb, value);
+        ege_select_one_action_set_active(EGE_SELECT_ONE_ACTION(hb), value);
     }
 }
 
@@ -1712,55 +1689,28 @@ void
 SPDesktopWidget::viewSetPosition (Geom::Point p)
 {
     Geom::Point const origin = ( p - ruler_origin );
-    gdouble hlower, hupper, hmax_range;
-    gdouble vlower, vupper, vmax_range;
-    sp_ruler_get_range(SP_RULER(hruler), &hlower, &hupper, NULL, &hmax_range);
-    sp_ruler_set_range(SP_RULER(hruler), hlower, hupper, origin[Geom::X], hmax_range);
-    sp_ruler_get_range(SP_RULER(vruler), &vlower, &vupper, NULL, &vmax_range);
-    sp_ruler_set_range(SP_RULER(vruler), vlower, vupper, origin[Geom::Y], vmax_range);
+    sp_ruler_set_position(SP_RULER(hruler), origin[Geom::X]);
+    sp_ruler_set_position(SP_RULER(vruler), origin[Geom::Y]);
 }
 
 void
 sp_desktop_widget_update_rulers (SPDesktopWidget *dtw)
 {
-    sp_desktop_widget_update_hruler(dtw);
-    sp_desktop_widget_update_vruler(dtw);
-}
-
-void
-sp_desktop_widget_update_hruler (SPDesktopWidget *dtw)
-{
-    /* The viewbox (in integers) must exactly match the size of SPCanvasbuf's pixel buffer.
-     * This is important because the former is being used for drawing the ruler, whereas
-     * the latter is used for drawing e.g. the grids and guides. Only when the viewbox
-     * coincides with the pixel buffer, everything will line up nicely.
-     */
-    Geom::IntRect viewbox = dtw->canvas->getViewboxIntegers();
-    gdouble position;
+    Geom::Rect viewbox = dtw->desktop->get_display_area();
 
-    double const scale = dtw->desktop->current_zoom();
-    double s = viewbox.min()[Geom::X] / scale - dtw->ruler_origin[Geom::X];
-    double e = viewbox.max()[Geom::X] / scale - dtw->ruler_origin[Geom::X];
-    sp_ruler_get_range(SP_RULER(dtw->hruler), NULL, NULL, &position, NULL);
-    sp_ruler_set_range(SP_RULER(dtw->hruler), s,  e, position, (e - s));
-}
-
-void
-sp_desktop_widget_update_vruler (SPDesktopWidget *dtw)
-{
-    /* The viewbox (in integers) must exactly match the size of SPCanvasbuf's pixel buffer.
-     * This is important because the former is being used for drawing the ruler, whereas
-     * the latter is used for drawing e.g. the grids and guides. Only when the viewbox
-     * coincides with the pixel buffer, everything will line up nicely.
-     */
-    Geom::IntRect viewbox = dtw->canvas->getViewboxIntegers();
-    gdouble position;
+    double lower_x = dtw->dt2r * (viewbox.left()  - dtw->ruler_origin[Geom::X]);
+    double upper_x = dtw->dt2r * (viewbox.right() - dtw->ruler_origin[Geom::X]);
+    sp_ruler_set_range(SP_RULER(dtw->hruler),
+	      	       lower_x,
+		       upper_x,
+		       (upper_x - lower_x));
 
-    double const scale = dtw->desktop->current_zoom();
-    double s = viewbox.min()[Geom::Y] / -scale - dtw->ruler_origin[Geom::Y];
-    double e = viewbox.max()[Geom::Y] / -scale - dtw->ruler_origin[Geom::Y];
-    sp_ruler_get_range(SP_RULER(dtw->vruler), NULL, NULL, &position, NULL);
-    sp_ruler_set_range(SP_RULER(dtw->vruler), s, e, position, (e - s));
+    double lower_y = dtw->dt2r * (viewbox.bottom() - dtw->ruler_origin[Geom::Y]);
+    double upper_y = dtw->dt2r * (viewbox.top()    - dtw->ruler_origin[Geom::Y]);
+    sp_ruler_set_range(SP_RULER(dtw->vruler),
+                       lower_y,
+		       upper_y,
+		       (upper_y - lower_y));
 }
 
 
@@ -1772,8 +1722,8 @@ void SPDesktopWidget::namedviewModified(SPObject *obj, guint flags)
         this->dt2r = 1.0 / nv->doc_units->unittobase;
         this->ruler_origin = Geom::Point(0,0); //nv->gridorigin;   Why was the grid origin used here?
 
-        sp_ruler_set_metric(SP_RULER (this->vruler), nv->getDefaultMetric());
-        sp_ruler_set_metric(SP_RULER (this->hruler), nv->getDefaultMetric());
+        sp_ruler_set_unit(SP_RULER (this->vruler), nv->getDefaultMetric());
+        sp_ruler_set_unit(SP_RULER (this->hruler), nv->getDefaultMetric());
 
         /* This loops through all the grandchildren of aux toolbox,
          * and for each that it finds, it performs an sp_search_by_data_recursive(),
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index dde511612..b17dcf470 100644
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -113,7 +113,7 @@ GType sp_font_selector_get_type()
 
 static void sp_font_selector_class_init(SPFontSelectorClass *c)
 {
-    GObjectClass *object_class = (GObjectClass *) c;
+    GObjectClass *object_class = G_OBJECT_CLASS(c);
 
     fs_parent_class = (GtkHBoxClass* )g_type_class_peek_parent (c);
 
@@ -285,7 +285,7 @@ static void sp_font_selector_family_select_row(GtkTreeSelection *selection,
     for ( ; list ; list = list->next )
     {
         gtk_list_store_append (store, &iter);
-        gtk_list_store_set (store, &iter, 0, (char*)list->data, -1);
+        gtk_list_store_set (store, &iter, 0, static_cast<char*>(list->data), -1);
     }
 
     gtk_tree_view_set_model (GTK_TREE_VIEW (fsel->style_treeview), GTK_TREE_MODEL (store));
@@ -433,7 +433,7 @@ GtkWidget *sp_font_selector_new()
 {
     SPFontSelector *fsel = SP_FONT_SELECTOR(g_object_new(SP_TYPE_FONT_SELECTOR, NULL));
 
-    return (GtkWidget *) fsel;
+    return GTK_WIDGET(fsel);
 }
 
 /*
@@ -453,7 +453,7 @@ unsigned int sp_font_selector_get_best_style (font_instance *font, GList *list)
 
     char *incomingFontString = pango_font_description_to_string(incomingFont);
 
-    tempFont = (font_factory::Default())->FaceFromUIStrings(family.c_str(), (char*)list->data);
+    tempFont = (font_factory::Default())->FaceFromUIStrings(family.c_str(), static_cast<char*>(list->data));
 
     PangoFontDescription *bestMatchForFont = NULL;
     if (tempFont) {
@@ -469,7 +469,7 @@ unsigned int sp_font_selector_get_best_style (font_instance *font, GList *list)
     while (list) {
         currentStyleNumber++;
 
-        tempFont = font_factory::Default()->FaceFromUIStrings(family.c_str(), (char*)list->data);
+        tempFont = font_factory::Default()->FaceFromUIStrings(family.c_str(), static_cast<char*>(list->data));
 
         PangoFontDescription *currentMatchForFont = NULL;
         if (tempFont) {
diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp
index 359a41167..2d58355db 100644
--- a/src/widgets/gradient-image.cpp
+++ b/src/widgets/gradient-image.cpp
@@ -69,8 +69,8 @@ GType sp_gradient_image_get_type(void)
 
 static void sp_gradient_image_class_init(SPGradientImageClass *klass)
 {
-	GtkWidgetClass *widget_class = (GtkWidgetClass *) klass;
-	parent_class = (GtkWidgetClass*)g_type_class_peek_parent (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); 
@@ -80,7 +80,7 @@ static void sp_gradient_image_class_init(SPGradientImageClass *klass)
 	widget_class->draw = sp_gradient_image_draw;
 	widget_class->destroy = sp_gradient_image_destroy;
 #else
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
+	GtkObjectClass *object_class = GTK_OBJECT_CLASS(klass);
 
 	object_class->destroy = sp_gradient_image_destroy;
 	widget_class->size_request = sp_gradient_image_size_request;
@@ -120,8 +120,8 @@ static void sp_gradient_image_destroy(GtkObject *object)
 	if (parent_class->destroy)
 		(* (parent_class)->destroy) (object);
 #else
-	if (((GtkObjectClass *) (parent_class))->destroy)
-		(* ((GtkObjectClass *) (parent_class))->destroy) (object);
+	if ((GTK_OBJECT_CLASS(parent_class))->destroy)
+		(* (GTK_OBJECT_CLASS(parent_class))->destroy) (object);
 #endif
 }
 
@@ -196,7 +196,7 @@ sp_gradient_image_new (SPGradient *gradient)
 
 	sp_gradient_image_set_gradient (image, gradient);
 
-	return (GtkWidget *) image;
+	return GTK_WIDGET(image);
 }
 
 GdkPixbuf*
diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp
index 89a891284..2c6774fe9 100644
--- a/src/widgets/gradient-selector.cpp
+++ b/src/widgets/gradient-selector.cpp
@@ -86,9 +86,9 @@ GType sp_gradient_selector_get_type(void)
 
 static void sp_gradient_selector_class_init(SPGradientSelectorClass *klass)
 {
-    GObjectClass *object_class = (GObjectClass *) klass;
+    GObjectClass *object_class = G_OBJECT_CLASS(klass);
 
-    parent_class = (GtkVBoxClass*)g_type_class_peek_parent (klass);
+    parent_class = GTK_VBOX_CLASS(g_type_class_peek_parent (klass));
 
     signals[GRABBED] =  g_signal_new ("grabbed",
                                         G_TYPE_FROM_CLASS(object_class),
@@ -196,7 +196,7 @@ static void sp_gradient_selector_init(SPGradientSelector *sel)
     gtk_box_pack_start( GTK_BOX(sel), hb, FALSE, FALSE, 0 );
 
     sel->add = gtk_button_new ();
-    gtk_button_set_image((GtkButton*)sel->add , gtk_image_new_from_stock ( GTK_STOCK_ADD, GTK_ICON_SIZE_SMALL_TOOLBAR ) );
+    gtk_button_set_image(GTK_BUTTON(sel->add), gtk_image_new_from_stock ( GTK_STOCK_ADD, GTK_ICON_SIZE_SMALL_TOOLBAR ) );
 
     sel->nonsolid.push_back(sel->add);
     gtk_box_pack_start (GTK_BOX (hb), sel->add, FALSE, FALSE, 0);
@@ -207,7 +207,7 @@ static void sp_gradient_selector_init(SPGradientSelector *sel)
     gtk_widget_set_tooltip_text( sel->add, _("Create a duplicate gradient"));
 
     sel->edit = gtk_button_new ();
-    gtk_button_set_image((GtkButton*)sel->edit , gtk_image_new_from_stock ( GTK_STOCK_EDIT, GTK_ICON_SIZE_SMALL_TOOLBAR ) );
+    gtk_button_set_image(GTK_BUTTON(sel->edit), gtk_image_new_from_stock ( GTK_STOCK_EDIT, GTK_ICON_SIZE_SMALL_TOOLBAR ) );
 
     sel->nonsolid.push_back(sel->edit);
     gtk_box_pack_start (GTK_BOX (hb), sel->edit, FALSE, FALSE, 0);
@@ -217,7 +217,7 @@ static void sp_gradient_selector_init(SPGradientSelector *sel)
     gtk_widget_set_tooltip_text( sel->edit, _("Edit gradient"));
 
     sel->del = gtk_button_new ();
-    gtk_button_set_image((GtkButton*)sel->del , gtk_image_new_from_stock ( GTK_STOCK_REMOVE, GTK_ICON_SIZE_SMALL_TOOLBAR ) );
+    gtk_button_set_image(GTK_BUTTON(sel->del), gtk_image_new_from_stock ( GTK_STOCK_REMOVE, GTK_ICON_SIZE_SMALL_TOOLBAR ) );
 
     sel->swatch_widgets.push_back(sel->del);
     gtk_box_pack_start (GTK_BOX (hb), sel->del, FALSE, FALSE, 0);
@@ -251,8 +251,8 @@ static void sp_gradient_selector_dispose(GObject *object)
         sel->text_renderer = NULL;
     }
 
-    if (((GObjectClass *) (parent_class))->dispose) {
-        (* ((GObjectClass *) (parent_class))->dispose) (object);
+    if ((G_OBJECT_CLASS(parent_class))->dispose) {
+        (* (G_OBJECT_CLASS(parent_class))->dispose) (object);
     }
 }
 
@@ -267,7 +267,7 @@ GtkWidget *sp_gradient_selector_new()
 {
     SPGradientSelector *sel = SP_GRADIENT_SELECTOR(g_object_new (SP_TYPE_GRADIENT_SELECTOR, NULL));
 
-    return (GtkWidget *) sel;
+    return GTK_WIDGET(sel);
 }
 
 void SPGradientSelector::setMode(SelectorMode mode)
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 51013a2cd..3a95b552a 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -609,7 +609,7 @@ static void update_stop_list( GtkWidget *vb, SPGradient *gradient, SPStop *new_s
     if (!combo_box) {
         return;
     }
-    GtkListStore *store = (GtkListStore *)gtk_combo_box_get_model (GTK_COMBO_BOX(combo_box));
+    GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combo_box)));
     if (!store) {
         return;
     }
@@ -720,7 +720,7 @@ static SPStop *get_selected_stop( GtkWidget *vb)
     if (combo_box) {
         GtkTreeIter  iter;
         if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX(combo_box), &iter)) {
-            GtkListStore *store = (GtkListStore *)gtk_combo_box_get_model (GTK_COMBO_BOX(combo_box));
+            GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combo_box)));
             gtk_tree_model_get (GTK_TREE_MODEL(store), &iter, 2, &stop, -1);
         }
     }
@@ -931,7 +931,7 @@ static GtkWidget * sp_gradient_vector_widget_new(SPGradient *gradient, SPStop *s
 
     /* Adjustment */
     GtkAdjustment *Offset_adj = NULL;
-    Offset_adj= (GtkAdjustment *) gtk_adjustment_new(0.0, 0.0, 1.0, 0.01, 0.01, 0.0);
+    Offset_adj= GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 1.0, 0.01, 0.01, 0.0));
     g_object_set_data(G_OBJECT(vb), "offset", Offset_adj);
 
     SPStop *stop = get_selected_stop(vb);
@@ -1197,10 +1197,10 @@ static void sp_gradient_vector_widget_destroy(GtkWidget *object, gpointer /*data
 static void sp_gradient_vector_widget_destroy(GtkObject *object, gpointer /*data*/)
 #endif
 {
-    SPObject *gradient = reinterpret_cast<SPObject*>(g_object_get_data(G_OBJECT(object), "gradient"));
+    SPObject *gradient = SP_OBJECT(g_object_get_data(G_OBJECT(object), "gradient"));
 
-    sigc::connection *release_connection = (sigc::connection *)g_object_get_data(G_OBJECT(object), "gradient_release_connection");
-    sigc::connection *modified_connection = (sigc::connection *)g_object_get_data(G_OBJECT(object), "gradient_modified_connection");
+    sigc::connection *release_connection = static_cast<sigc::connection *>(g_object_get_data(G_OBJECT(object), "gradient_release_connection"));
+    sigc::connection *modified_connection = static_cast<sigc::connection *>(g_object_get_data(G_OBJECT(object), "gradient_modified_connection"));
 
     if (gradient) {
         g_assert( release_connection != NULL );
@@ -1316,7 +1316,7 @@ static void sp_gradient_vector_color_changed(SPColorSelector *csel, GObject *obj
     if (combo_box) {
         GtkTreeIter  iter;
         if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX(combo_box), &iter)) {
-            GtkListStore *store = (GtkListStore *)gtk_combo_box_get_model (GTK_COMBO_BOX(combo_box));
+            GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combo_box)));
 
             Inkscape::UI::Widget::ColorPreview *cp = Gtk::manage(new Inkscape::UI::Widget::ColorPreview(sp_stop_get_rgba32(stop)));
             GdkPixbuf *pb = cp->toPixbuf(64, 16);
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index d3b7e2dbb..ff443504d 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -164,13 +164,10 @@ GType SPIcon::getType()
 
 void IconImpl::classInit(SPIconClass *klass)
 {
-    GObjectClass *object_class;
-    GtkWidgetClass *widget_class;
+    GObjectClass   *object_class = G_OBJECT_CLASS(klass);
+    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
 
-    object_class = (GObjectClass *) klass;
-    widget_class = (GtkWidgetClass *) klass;
-
-    parent_class = (GtkWidgetClass*)g_type_class_peek_parent(klass);
+    parent_class = GTK_WIDGET_CLASS(g_type_class_peek_parent(klass));
 
     object_class->dispose = IconImpl::dispose;
 
@@ -205,7 +202,7 @@ void IconImpl::dispose(GObject *object)
         icon->name = 0;
     }
 
-    ((GObjectClass *) (parent_class))->dispose(object);
+    (G_OBJECT_CLASS(parent_class))->dispose(object);
 }
 
 void IconImpl::reset( SPIcon *icon )
@@ -865,7 +862,7 @@ GtkWidget *IconImpl::newFull( Inkscape::IconSize lsize, gchar const *name )
             if ( dump ) {
                 g_message( "skipped gtk '%s' %d  (not GTK_IMAGE_STOCK)", name, lsize );
             }
-            //g_object_unref( (GObject *)img );
+            //g_object_unref(G_OBJECT(img));
             img = 0;
         }
     }
@@ -1022,7 +1019,7 @@ int IconImpl::getPhysSize(int size)
             "inkscape-decoration"
         };
 
-        GtkWidget *icon = (GtkWidget *)g_object_new(SP_TYPE_ICON, NULL);
+        GtkWidget *icon = GTK_WIDGET(g_object_new(SP_TYPE_ICON, NULL));
 
         for (unsigned i = 0; i < G_N_ELEMENTS(gtkSizes); ++i) {
             guint const val_ix = (gtkSizes[i] <= GTK_ICON_SIZE_DIALOG) ? (guint)gtkSizes[i] : (guint)Inkscape::ICON_SIZE_DECORATION;
@@ -1075,7 +1072,7 @@ int IconImpl::getPhysSize(int size)
 
 GdkPixbuf *IconImpl::loadPixmap(gchar const *name, unsigned /*lsize*/, unsigned psize)
 {
-    gchar *path = (gchar *) g_strdup_printf("%s/%s.png", INKSCAPE_PIXMAPDIR, name);
+    gchar *path = g_strdup_printf("%s/%s.png", INKSCAPE_PIXMAPDIR, name);
     // TODO: bulia, please look over
     gsize bytesRead = 0;
     gsize bytesWritten = 0;
@@ -1089,7 +1086,7 @@ GdkPixbuf *IconImpl::loadPixmap(gchar const *name, unsigned /*lsize*/, unsigned
     g_free(localFilename);
     g_free(path);
     if (!pb) {
-        path = (gchar *) g_strdup_printf("%s/%s.xpm", INKSCAPE_PIXMAPDIR, name);
+        path = g_strdup_printf("%s/%s.xpm", INKSCAPE_PIXMAPDIR, name);
         // TODO: bulia, please look over
         gsize bytesRead = 0;
         gsize bytesWritten = 0;
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 5a6e774f5..b0738b6a6 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -157,9 +157,9 @@ GType sp_paint_selector_get_type(void)
 static void
 sp_paint_selector_class_init(SPPaintSelectorClass *klass)
 {
-    GObjectClass *object_class = (GObjectClass *) klass;
+    GObjectClass *object_class = G_OBJECT_CLASS(klass);
 
-    parent_class = (GtkVBoxClass*)g_type_class_peek_parent(klass);
+    parent_class = GTK_VBOX_CLASS(g_type_class_peek_parent(klass));
 
     psel_signals[MODE_CHANGED] = g_signal_new("mode_changed",
                                                 G_TYPE_FROM_CLASS(object_class),
@@ -311,8 +311,8 @@ static void sp_paint_selector_dispose(GObject *object)
     // clean up our long-living pattern menu
     g_object_set_data(G_OBJECT(psel),"patternmenu",NULL);
 
-    if (((GObjectClass *) parent_class)->dispose)
-        (* ((GObjectClass *) parent_class)->dispose)(object);
+    if ((G_OBJECT_CLASS(parent_class))->dispose)
+        (* (G_OBJECT_CLASS(parent_class))->dispose)(object);
 }
 
 static GtkWidget *sp_paint_selector_style_button_add(SPPaintSelector *psel,
@@ -655,7 +655,7 @@ static void sp_paint_selector_set_mode_color(SPPaintSelector *psel, SPPaintSelec
 
     if ((psel->mode == SPPaintSelector::MODE_COLOR_RGB) || (psel->mode == SPPaintSelector::MODE_COLOR_CMYK)) {
         /* Already have color selector */
-        csel = (GtkWidget*)g_object_get_data(G_OBJECT(psel->selector), "color-selector");
+        csel = GTK_WIDGET(g_object_get_data(G_OBJECT(psel->selector), "color-selector"));
     } else {
 
         sp_paint_selector_clear_frame(psel);
@@ -732,7 +732,7 @@ static void sp_paint_selector_set_mode_gradient(SPPaintSelector *psel, SPPaintSe
 
     if ((psel->mode == SPPaintSelector::MODE_GRADIENT_LINEAR) || (psel->mode == SPPaintSelector::MODE_GRADIENT_RADIAL)) {
         /* Already have gradient selector */
-        gsel = (GtkWidget*)g_object_get_data(G_OBJECT(psel->selector), "gradient-selector");
+        gsel = GTK_WIDGET(g_object_get_data(G_OBJECT(psel->selector), "gradient-selector"));
     } else {
         sp_paint_selector_clear_frame(psel);
         /* Create new gradient selector */
@@ -799,7 +799,7 @@ ink_pattern_list_get (SPDocument *source)
 
     GSList *pl = NULL;
     GSList const *patterns = source->getResourceList("pattern");
-    for (GSList *l = (GSList *) patterns; l != NULL; l = l->next) {
+    for (GSList *l = const_cast<GSList *>(patterns); l != NULL; l = l->next) {
         if (SP_PATTERN(l->data) == pattern_getroot(SP_PATTERN(l->data))) {  // only if this is a root pattern
             pl = g_slist_prepend(pl, l->data);
         }
@@ -995,7 +995,7 @@ static void sp_paint_selector_set_mode_pattern(SPPaintSelector *psel, SPPaintSel
 
     if (psel->mode == SPPaintSelector::MODE_PATTERN) {
         /* Already have pattern menu */
-        tbl = (GtkWidget*)g_object_get_data(G_OBJECT(psel->selector), "pattern-selector");
+        tbl = GTK_WIDGET(g_object_get_data(G_OBJECT(psel->selector), "pattern-selector"));
     } else {
         sp_paint_selector_clear_frame(psel);
 
@@ -1081,7 +1081,7 @@ SPPattern *SPPaintSelector::getPattern()
     SPPattern *pat = 0;
     g_return_val_if_fail((mode == MODE_PATTERN) , NULL);
 
-    GtkWidget *combo = (GtkWidget *) g_object_get_data(G_OBJECT(this), "patternmenu");
+    GtkWidget *combo = GTK_WIDGET(g_object_get_data(G_OBJECT(this), "patternmenu"));
 
     /* no pattern menu if we were just selected */
     if ( combo == NULL ) {
diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp
index d0e71d2b0..87942f141 100644
--- a/src/widgets/pencil-toolbar.cpp
+++ b/src/widgets/pencil-toolbar.cpp
@@ -242,7 +242,7 @@ static void sp_pencil_tb_defaults(GtkWidget * /*widget*/, GObject *obj)
     // fixme: make settable
     gdouble tolerance = 4;
 
-    adj = (GtkAdjustment*)g_object_get_data(obj, "tolerance");
+    adj = GTK_ADJUSTMENT(g_object_get_data(obj, "tolerance"));
     gtk_adjustment_set_value(adj, tolerance);
     gtk_adjustment_value_changed(adj);
 
@@ -282,7 +282,7 @@ public:
         }
         g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE) );
 
-        GtkAdjustment * adj = (GtkAdjustment*)g_object_get_data(tbl, "tolerance");
+        GtkAdjustment * adj = GTK_ADJUSTMENT(g_object_get_data(tbl, "tolerance"));
 
         double v = val.getDouble(adj->value);
         gtk_adjustment_set_value(adj, v);
diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp
index 5104d5a9d..c1f9be2a5 100644
--- a/src/widgets/ruler.cpp
+++ b/src/widgets/ruler.cpp
@@ -1,5 +1,18 @@
 /*
- * Customized ruler class for inkscape
+ * Customized ruler class for inkscape.  Note that this is a fork of
+ * the GimpRuler widget from GIMP: libgimpwidgets/gimpruler.c.
+ * The GIMP code is released under the GPL 3.  The GIMP code itself
+ * is a fork of the now-obsolete GtkRuler widget from GTK+ 2.
+ *
+ * Major differences between implementations in Inkscape and GIMP are
+ * as follows:
+ *  - We use a 1,2,4,8... scale for inches and 1,2,5,10... for everything
+ *    else.  GIMP uses 1,2,5,10... for everything.
+ *
+ *  - We use a default font size of PANGO_SCALE_X_SMALL for labels,
+ *    GIMP uses PANGO_SCALE_SMALL (i.e., a bit larger than ours).
+ *
+ *  - We abbreviate large numbers in tick-labels (e.g., 10000 -> 10k) 
  *
  * Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
@@ -7,6 +20,7 @@
  *   bulia byak <buliabyak@users.sf.net>
  *   Diederik van Lierop <mail@diedenrezi.nl>
  *   Jon A. Cruz <jon@joncruz.org>
+ *   Alex Valavanis <valavanisalex@gmail.com>
  *
  * Copyright (C) 1999-2011 authors
  *
@@ -18,143 +32,178 @@
 #include <cstdio>
 
 #include "widget-sizes.h"
-#include "desktop-widget.h"
 #include "ruler.h"
 #include "unit-constants.h"
 #include "round.h"
 #include <glibmm/i18n.h>
 
-#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-
-#define MINIMUM_INCR          5
-#define MAXIMUM_SUBDIVIDE     5
-#define MAXIMUM_SCALES        10
-
 #define ROUND(x) ((int) ((x) + 0.5))
 
-struct _SPRulerPrivate
-{
-  GtkOrientation orientation;
-  SPRulerMetric *metric;
+#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+
+#define DEFAULT_RULER_FONT_SCALE  PANGO_SCALE_X_SMALL
+#define MINIMUM_INCR              5
 
-#if GTK_CHECK_VERSION(3,0,0)
-  cairo_surface_t *backing_store;
-#else
-  GdkPixmap *backing_store;
-#endif
-  
-  gint slider_size;
-  gint xsrc;
-  gint ysrc;
-
-  gdouble lower;    /* The upper limit of the ruler (in points) */
-  gdouble upper;    /* The lower limit of the ruler */
-  gdouble position; /* The position of the mark on the ruler */
-  gdouble max_size; /* The maximum size of the ruler */
-};
 
 enum {
   PROP_0,
   PROP_ORIENTATION,
+  PROP_UNIT,
   PROP_LOWER,
   PROP_UPPER,
   PROP_POSITION,
-  PROP_MAX_SIZE,
-  PROP_METRIC
+  PROP_MAX_SIZE
 };
 
-static void     sp_ruler_set_property    (GObject        *object,
-                                                      guint            prop_id,
-                                                      const GValue   *value,
-                                                      GParamSpec     *pspec);
-static void     sp_ruler_get_property    (GObject        *object,
-                                                      guint           prop_id,
-                                                      GValue         *value,
-                                                      GParamSpec     *pspec);
-static void     sp_ruler_realize         (GtkWidget      *widget);
-static void     sp_ruler_unrealize       (GtkWidget      *widget);
-static void     sp_ruler_size_request                (GtkWidget      *widget,
-                                                      GtkRequisition *requisition);
 
-#if GTK_CHECK_VERSION(3,0,0)
-static void     sp_ruler_get_preferred_width         (GtkWidget *widget, 
-                                                      gint      *minimal_width,
-						      gint      *natural_width);
+/* All distances below are in 1/72nd's of an inch. (According to
+ * Adobe, that's a point, but points are really 1/72.27 in.)
+ */
+typedef struct
+{
+  GtkOrientation   orientation;
+  SPMetric         unit;
+  gdouble          lower;
+  gdouble          upper;
+  gdouble          position;
+  gdouble          max_size;
+
+  GdkWindow       *input_window;
+  cairo_surface_t *backing_store;
+  PangoLayout     *layout;
+  gdouble          font_scale;
+  
+  gint             xsrc;
+  gint             ysrc;
 
-static void     sp_ruler_get_preferred_height        (GtkWidget *widget, 
-                                                      gint *minimal_height,
-						      gint *natural_height);
-#endif
+  GList           *track_widgets;
+} SPRulerPrivate;
+
+#define SP_RULER_GET_PRIVATE(ruler) \
+  G_TYPE_INSTANCE_GET_PRIVATE (ruler, SP_TYPE_RULER, SPRulerPrivate)
+
+
+struct SPRulerMetric
+{
+  gdouble ruler_scale[16];
+  gint    subdivide[5];
+};
+
+// Ruler metric for general use.
+static SPRulerMetric const ruler_metric_general = {
+  { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000, 2500, 5000, 10000, 25000, 50000, 100000 },
+  { 1, 5, 10, 50, 100 }
+};
+
+// Ruler metric for inch scales.
+static SPRulerMetric const ruler_metric_inches = {
+  { 1, 2, 4,  8, 16, 32,  64, 128, 256,  512, 1024, 2048, 4096, 8192, 16384, 32768 },
+  { 1, 2,  4,  8,  16 }
+};
+
+static void          sp_ruler_dispose              (GObject        *object);
+static void          sp_ruler_set_property         (GObject        *object,
+                                                    guint           prop_id,
+                                                    const GValue   *value,
+                                                    GParamSpec     *pspec);
+static void          sp_ruler_get_property         (GObject        *object,
+                                                    guint           prop_id,
+                                                    GValue         *value,
+                                                    GParamSpec     *pspec);
+
+static void          sp_ruler_realize              (GtkWidget      *widget);
+static void          sp_ruler_unrealize            (GtkWidget      *widget);
+static void          sp_ruler_map                  (GtkWidget      *widget);
+static void          sp_ruler_unmap                (GtkWidget      *widget);
+static void          sp_ruler_size_allocate        (GtkWidget      *widget,
+                                                    GtkAllocation  *allocation);
 
-static void     sp_ruler_size_allocate   (GtkWidget      *widget,
-                                                      GtkAllocation  *allocation);
-static gboolean sp_ruler_motion_notify               (GtkWidget      *widget,
-                                                      GdkEventMotion *event);
 #if GTK_CHECK_VERSION(3,0,0)
-static gboolean sp_ruler_draw            (GtkWidget      *widget,
-		                          cairo_t        *cr);
+static void          sp_ruler_get_preferred_width  (GtkWidget      *widget, 
+                                                    gint           *minimum_width,
+                                                    gint           *natural_width);
+
+static void          sp_ruler_get_preferred_height (GtkWidget      *widget, 
+                                                    gint           *minimum_height,
+                                                    gint           *natural_height);
+static void          sp_ruler_style_updated        (GtkWidget      *widget);
 #else
-static gboolean sp_ruler_expose          (GtkWidget      *widget,
-                                          GdkEventExpose *event);
+static void          sp_ruler_size_request         (GtkWidget      *widget,
+                                                    GtkRequisition *requisition);
+static void          sp_ruler_style_set            (GtkWidget      *widget,
+		                                    GtkStyle       *prev_style);
 #endif
-static void     sp_ruler_make_pixmap     (SPRuler *ruler);
-static void     sp_ruler_draw_ticks      (SPRuler *ruler);
-static void     sp_ruler_real_draw_ticks (SPRuler *ruler,
-		                          cairo_t *cr);
-static void     sp_ruler_real_draw_pos   (SPRuler *ruler,
-		                          cairo_t *cr);
-
-#define SP_RULER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), SP_TYPE_RULER, SPRulerPrivate))
-
-// Note: const casts are due to SPRuler being const-broken and not scheduled for any more fixes.
-/// Ruler metrics.
-static SPRulerMetric const sp_ruler_metrics[] = {
-  // NOTE: the order of records in this struct must correspond to the SPMetric enum.
-  {const_cast<gchar*>("NONE"),          const_cast<gchar*>(""),   1,         { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
-  {const_cast<gchar*>("millimeters"),   const_cast<gchar*>("mm"), PX_PER_MM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
-  {const_cast<gchar*>("centimeters"),   const_cast<gchar*>("cm"), PX_PER_CM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
-  {const_cast<gchar*>("inches"),        const_cast<gchar*>("in"), PX_PER_IN, { 1, 2, 4,  8, 16, 32,  64, 128, 256,  512 }, { 1, 2,  4,  8,  16 }},
-  {const_cast<gchar*>("feet"),          const_cast<gchar*>("ft"), PX_PER_FT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
-  {const_cast<gchar*>("points"),        const_cast<gchar*>("pt"), PX_PER_PT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
-  {const_cast<gchar*>("picas"),         const_cast<gchar*>("pc"), PX_PER_PC, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
-  {const_cast<gchar*>("pixels"),        const_cast<gchar*>("px"), PX_PER_PX, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
-  {const_cast<gchar*>("meters"),        const_cast<gchar*>("m"),  PX_PER_M,  { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
-};
 
-G_DEFINE_TYPE_WITH_CODE (SPRuler, sp_ruler, GTK_TYPE_WIDGET,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE,
-                                                NULL))
+static gboolean      sp_ruler_motion_notify        (GtkWidget      *widget,
+                                                    GdkEventMotion *event);
+static gboolean      sp_ruler_draw                 (GtkWidget      *widget,
+		                                    cairo_t        *cr);
+#if !GTK_CHECK_VERSION(3,0,0)
+static gboolean      sp_ruler_expose               (GtkWidget      *widget,
+                                                    GdkEventExpose *event);
+#endif
+static void          sp_ruler_draw_ticks           (SPRuler        *ruler);
+static void          sp_ruler_draw_pos             (SPRuler        *ruler);
+static void          sp_ruler_make_pixmap          (SPRuler        *ruler);
+
+static PangoLayout * sp_ruler_get_layout           (GtkWidget      *widget,
+                                                    const gchar    *text);
+
+
+G_DEFINE_TYPE (SPRuler, sp_ruler, GTK_TYPE_WIDGET)
+
+#define parent_class sp_ruler_parent_class
+
 
 static void
 sp_ruler_class_init (SPRulerClass *klass)
 {
-  GObjectClass   *gobject_class = G_OBJECT_CLASS (klass);
+  GObjectClass   *object_class  = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class  = GTK_WIDGET_CLASS (klass);
 
-  gobject_class->set_property = sp_ruler_set_property;
-  gobject_class->get_property = sp_ruler_get_property;
+  object_class->dispose              = sp_ruler_dispose;
+  object_class->set_property         = sp_ruler_set_property;
+  object_class->get_property         = sp_ruler_get_property;
 
-  widget_class->realize = sp_ruler_realize;
-  widget_class->unrealize = sp_ruler_unrealize;
+  widget_class->realize              = sp_ruler_realize;
+  widget_class->unrealize            = sp_ruler_unrealize;
+  widget_class->map                  = sp_ruler_map;
+  widget_class->unmap                = sp_ruler_unmap;
+  widget_class->size_allocate        = sp_ruler_size_allocate;
 #if GTK_CHECK_VERSION(3,0,0)
-  widget_class->get_preferred_width = sp_ruler_get_preferred_width;
+  widget_class->get_preferred_width  = sp_ruler_get_preferred_width;
   widget_class->get_preferred_height = sp_ruler_get_preferred_height;
-  widget_class->draw = sp_ruler_draw;
+  widget_class->style_updated        = sp_ruler_style_updated;
+  widget_class->draw                 = sp_ruler_draw;
 #else
-  widget_class->size_request = sp_ruler_size_request;
-  widget_class->expose_event = sp_ruler_expose;
+  widget_class->size_request         = sp_ruler_size_request;
+  widget_class->style_set            = sp_ruler_style_set;
+  widget_class->expose_event         = sp_ruler_expose;
 #endif
-  widget_class->size_allocate = sp_ruler_size_allocate;
   widget_class->motion_notify_event = sp_ruler_motion_notify;
 
-  klass->draw_ticks = sp_ruler_real_draw_ticks;
-  klass->draw_pos = sp_ruler_real_draw_pos;
-
-  g_object_class_override_property (gobject_class,
-                                    PROP_ORIENTATION,
-                                    "orientation");
-
-  g_object_class_install_property (gobject_class,
+  g_type_class_add_private (object_class, sizeof (SPRulerPrivate));
+
+  g_object_class_install_property (object_class,
+                                   PROP_ORIENTATION,
+				   g_param_spec_enum ("orientation",
+					              _("Orientation"),
+						      _("The orientation of the ruler"),
+                                                      GTK_TYPE_ORIENTATION,
+						      GTK_ORIENTATION_HORIZONTAL,
+						      static_cast<GParamFlags>(GTK_PARAM_READWRITE)));
+
+  /* FIXME: Should probably use g_param_spec_enum */
+  g_object_class_install_property (object_class,
+                                   PROP_UNIT,
+                                   g_param_spec_uint ("unit",
+						      _("Unit"),
+						      _("Unit of the ruler"),
+						      0, 8,
+						      SP_PX,
+						      static_cast<GParamFlags>(GTK_PARAM_READWRITE)));
+  
+  g_object_class_install_property (object_class,
                                    PROP_LOWER,
                                    g_param_spec_double ("lower",
 							_("Lower"),
@@ -164,7 +213,7 @@ sp_ruler_class_init (SPRulerClass *klass)
 							0.0,
 							static_cast<GParamFlags>(GTK_PARAM_READWRITE)));  
 
-  g_object_class_install_property (gobject_class,
+  g_object_class_install_property (object_class,
                                    PROP_UPPER,
                                    g_param_spec_double ("upper",
 							_("Upper"),
@@ -174,7 +223,7 @@ sp_ruler_class_init (SPRulerClass *klass)
 							0.0,
 							static_cast<GParamFlags>(GTK_PARAM_READWRITE)));  
 
-  g_object_class_install_property (gobject_class,
+  g_object_class_install_property (object_class,
                                    PROP_POSITION,
                                    g_param_spec_double ("position",
 							_("Position"),
@@ -184,7 +233,7 @@ sp_ruler_class_init (SPRulerClass *klass)
 							0.0,
 							static_cast<GParamFlags>(GTK_PARAM_READWRITE)));  
 
-  g_object_class_install_property (gobject_class,
+  g_object_class_install_property (object_class,
                                    PROP_MAX_SIZE,
                                    g_param_spec_double ("max-size",
 							_("Max Size"),
@@ -193,75 +242,65 @@ sp_ruler_class_init (SPRulerClass *klass)
 							G_MAXDOUBLE,
 							0.0,
 							static_cast<GParamFlags>(GTK_PARAM_READWRITE)));  
-  /**
-   * SPRuler:metric:
-   *
-   * The metric used for the ruler.
-   *
-   * TODO: This should probably use g_param_spec_enum
-   */
-  g_object_class_install_property (gobject_class,
-                                   PROP_METRIC,
-                                   g_param_spec_uint("metric",
-						      _("Metric"),
-						      _("The metric used for the ruler"),
-						      0, 8,
-						      SP_PX,
-						      static_cast<GParamFlags>(GTK_PARAM_READWRITE)));  
 
-  g_type_class_add_private (gobject_class, sizeof (SPRulerPrivate));
+  gtk_widget_class_install_style_property (widget_class,
+		                           g_param_spec_double ("font-scale",
+						                NULL, NULL,
+								0.0,
+								G_MAXDOUBLE,
+								DEFAULT_RULER_FONT_SCALE,
+								G_PARAM_READABLE));
 }
 
 static void
 sp_ruler_init (SPRuler *ruler)
 {
-  ruler->priv = G_TYPE_INSTANCE_GET_PRIVATE(ruler,
-		                            SP_TYPE_RULER,
-					    SPRulerPrivate);
-
-  SPRulerPrivate *priv = ruler->priv;
+  SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler);
 
-  priv->orientation = GTK_ORIENTATION_HORIZONTAL;
+  gtk_widget_set_has_window (GTK_WIDGET (ruler), FALSE);
 
+  priv->orientation   = GTK_ORIENTATION_HORIZONTAL;
+  priv->unit          = SP_PX;
+  priv->lower         = 0;
+  priv->upper         = 0;
+  priv->position      = 0;
+  priv->max_size      = 0;
   priv->backing_store = NULL;
-  priv->xsrc = 0;
-  priv->ysrc = 0;
-  priv->slider_size = 0;
-  priv->lower = 0;
-  priv->upper = 0;
-  priv->position = 0;
-  priv->max_size = 0;
+  priv->font_scale    = DEFAULT_RULER_FONT_SCALE;
 
-  sp_ruler_set_metric(ruler, SP_PX);
+#if GTK_CHECK_VERSION(3,0,0)
+  const gchar *str = 
+    "SPRuler {\n"
+    "  background-color: @bg_color;\n"
+    "}\n";
+  
+  GtkCssProvider *css = gtk_css_provider_new ();
+  gtk_css_provider_load_from_data (css, str, -1, NULL);
+  gtk_style_context_add_provider (gtk_widget_get_style_context (GTK_WIDGET (ruler)),
+                                  GTK_STYLE_PROVIDER (css),
+                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+  g_object_unref (css);
+#endif
 }
 
-
-/**
- * sp_ruler_invalidate_ticks:
- * @ruler: the ruler to invalidate
- *
- * For performance reasons, #SPRuler keeps a backbuffer containing the
- * prerendered contents of the ticks. To cause a repaint of this buffer,
- * call this function instead of gtk_widget_queue_draw().
- **/
-static void sp_ruler_invalidate_ticks(SPRuler *ruler)
+static void
+sp_ruler_dispose (GObject *object)
 {
-	g_return_if_fail(SP_IS_RULER(ruler));
+  SPRuler        *ruler = SP_RULER (object);
+  SPRulerPrivate *priv  = SP_RULER_GET_PRIVATE (ruler);
 
-	if(ruler->priv->backing_store == NULL)
-		return;
+  while (priv->track_widgets)
+    sp_ruler_remove_track_widget (ruler, GTK_WIDGET(priv->track_widgets->data));
 
-	sp_ruler_draw_ticks(ruler);
-	gtk_widget_queue_draw(GTK_WIDGET(ruler));
+  G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 
 /**
  * sp_ruler_set_range:
- * @ruler: the gtkdeprecatedruler
+ * @ruler: the SPRuler
  * @lower: the lower limit of the ruler
  * @upper: the upper limit of the ruler
- * @position: the mark on the ruler
  * @max_size: the maximum size of the ruler used when calculating the space to
  * leave for the text
  *
@@ -269,14 +308,15 @@ static void sp_ruler_invalidate_ticks(SPRuler *ruler)
  */
 void
 sp_ruler_set_range (SPRuler *ruler,
-		     gdouble   lower,
-		     gdouble   upper,
-		     gdouble   position,
-		     gdouble   max_size)
+		    gdouble   lower,
+		    gdouble   upper,
+		    gdouble   max_size)
 {
+  SPRulerPrivate *priv;
+  
   g_return_if_fail (SP_IS_RULER (ruler));
 
-  SPRulerPrivate *priv = ruler->priv;
+  priv = SP_RULER_GET_PRIVATE (ruler);
 
   g_object_freeze_notify (G_OBJECT (ruler));
   if (priv->lower != lower)
@@ -289,11 +329,6 @@ sp_ruler_set_range (SPRuler *ruler,
       priv->upper = upper;
       g_object_notify (G_OBJECT (ruler), "upper");
     }
-  if (priv->position != position)
-    {
-      priv->position = position;
-      g_object_notify (G_OBJECT (ruler), "position");
-    }
   if (priv->max_size != max_size)
     {
       priv->max_size = max_size;
@@ -301,7 +336,7 @@ sp_ruler_set_range (SPRuler *ruler,
     }
   g_object_thaw_notify (G_OBJECT (ruler));
 
-  sp_ruler_invalidate_ticks(ruler);
+  gtk_widget_queue_draw (GTK_WIDGET (ruler));
 }
 
 /**
@@ -309,7 +344,6 @@ sp_ruler_set_range (SPRuler *ruler,
  * @ruler: a #SPRuler
  * @lower: (allow-none): location to store lower limit of the ruler, or %NULL
  * @upper: (allow-none): location to store upper limit of the ruler, or %NULL
- * @position: (allow-none): location to store the current position of the mark on the ruler, or %NULL
  * @max_size: location to store the maximum size of the ruler used when calculating
  *            the space to leave for the text, or %NULL.
  *
@@ -320,19 +354,18 @@ void
 sp_ruler_get_range (SPRuler *ruler,
 		     gdouble  *lower,
 		     gdouble  *upper,
-		     gdouble  *position,
 		     gdouble  *max_size)
 {
+  SPRulerPrivate *priv;
+
   g_return_if_fail (SP_IS_RULER (ruler));
   
-  SPRulerPrivate *priv = ruler->priv;
+  priv = SP_RULER_GET_PRIVATE (ruler);
 
   if (lower)
     *lower = priv->lower;
   if (upper)
     *upper = priv->upper;
-  if (position)
-    *position = priv->position;
   if (max_size)
     *max_size = priv->max_size;
 }
@@ -344,7 +377,7 @@ sp_ruler_set_property (GObject      *object,
 			GParamSpec   *pspec)
 {
   SPRuler *ruler = SP_RULER (object);
-  SPRulerPrivate *priv = ruler->priv;
+  SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler);
 
   switch (prop_id)
     {
@@ -352,25 +385,35 @@ sp_ruler_set_property (GObject      *object,
       priv->orientation = static_cast<GtkOrientation>(g_value_get_enum (value));
       gtk_widget_queue_resize (GTK_WIDGET (ruler));
       break;
+    
+    case PROP_UNIT:
+      sp_ruler_set_unit (ruler, static_cast<SPMetric>(g_value_get_int (value)));
+      break;
+
     case PROP_LOWER:
-      sp_ruler_set_range (ruler, g_value_get_double (value), priv->upper,
-			   priv->position, priv->max_size);
+      sp_ruler_set_range (ruler,
+                          g_value_get_double (value),
+                          priv->upper,
+			  priv->max_size);
       break;
     case PROP_UPPER:
-      sp_ruler_set_range (ruler, priv->lower, g_value_get_double (value),
-			   priv->position, priv->max_size);
+      sp_ruler_set_range (ruler,
+                          priv->lower,
+                          g_value_get_double (value),
+			  priv->max_size);
       break;
+
     case PROP_POSITION:
-      sp_ruler_set_range (ruler, priv->lower, priv->upper,
-			   g_value_get_double (value), priv->max_size);
+      sp_ruler_set_position (ruler, g_value_get_double (value));
       break;
+
     case PROP_MAX_SIZE:
-      sp_ruler_set_range (ruler, priv->lower, priv->upper,
-			   priv->position,  g_value_get_double (value));
-      break;
-    case PROP_METRIC:
-      sp_ruler_set_metric(ruler, static_cast<SPMetric>(g_value_get_enum (value)));
+      sp_ruler_set_range (ruler,
+                          priv->lower,
+                          priv->upper,
+			  g_value_get_double (value));
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -384,13 +427,17 @@ sp_ruler_get_property (GObject      *object,
 			GParamSpec   *pspec)
 {
   SPRuler *ruler = SP_RULER (object);
-  SPRulerPrivate *priv = ruler->priv;
+  SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler);
 
   switch (prop_id)
     {
     case PROP_ORIENTATION:
       g_value_set_enum (value, priv->orientation);
       break;
+    
+    case PROP_UNIT:
+      g_value_set_int (value, priv->unit);
+      break;
     case PROP_LOWER:
       g_value_set_double (value, priv->lower);
       break;
@@ -403,262 +450,326 @@ sp_ruler_get_property (GObject      *object,
     case PROP_MAX_SIZE:
       g_value_set_double (value, priv->max_size);
       break;
-    case PROP_METRIC:
-      g_value_set_enum(value, sp_ruler_get_metric(ruler));
-      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
     }
 }
 
-
-/**
- * sp_ruler_get_metric:
- * @ruler: a #SPRuler
- *
- * Gets the units used for a #SPRuler. See sp_ruler_set_metric().
- *
- * Return value: the units currently used for @ruler
- **/
-SPMetric sp_ruler_get_metric(SPRuler *ruler)
+static void
+sp_ruler_realize (GtkWidget *widget)
 {
-  g_return_val_if_fail(SP_IS_RULER(ruler), static_cast<SPMetric>(0));
-  SPRulerPrivate *priv = ruler->priv;
-
-  for (size_t i = 0; i < G_N_ELEMENTS(sp_ruler_metrics); i++) {
-    if (priv->metric == &sp_ruler_metrics[i]) {
-      return static_cast<SPMetric>(i);
-    }
-  }
-
-  g_assert_not_reached ();
-
-  return static_cast<SPMetric>(0);
-}
-
+  SPRuler        *ruler = SP_RULER (widget);
+  SPRulerPrivate *priv  = SP_RULER_GET_PRIVATE (ruler);
+  GtkAllocation   allocation;
+  GdkWindowAttr   attributes;
+  gint            attributes_mask;
 
-static void sp_ruler_draw_ticks(SPRuler *ruler)
-{
-  g_return_if_fail(SP_IS_RULER(ruler));
-  SPRulerPrivate *priv = ruler->priv;
+  GTK_WIDGET_CLASS (sp_ruler_parent_class)->realize (widget);
+  
+  gtk_widget_get_allocation (widget, &allocation);
 
+  attributes.window_type = GDK_WINDOW_CHILD;
+  attributes.x           = allocation.x;
+  attributes.y           = allocation.y;
+  attributes.width       = allocation.width;
+  attributes.height      = allocation.height;
+  attributes.wclass      = GDK_INPUT_ONLY;
 #if GTK_CHECK_VERSION(3,0,0)
-  cairo_t *cr = cairo_create(priv->backing_store);
+  attributes.event_mask  = (gtk_widget_get_events (widget) |
+                           GDK_EXPOSURE_MASK               |
+			   GDK_POINTER_MOTION_MASK         |
+			   GDK_POINTER_MOTION_HINT_MASK);
 #else
-  cairo_t *cr = gdk_cairo_create(priv->backing_store);
+  attributes.event_mask  = (gtk_widget_get_events (widget) |
+                           GDK_EXPOSURE_MASK               |
+			   GDK_POINTER_MOTION_MASK);
 #endif
 
-  if (SP_RULER_GET_CLASS(ruler)->draw_ticks)
-    SP_RULER_GET_CLASS(ruler)->draw_ticks(ruler, cr);
+  attributes_mask = GDK_WA_X | GDK_WA_Y;
 
-  cairo_destroy(cr);
-}
+  priv->input_window = gdk_window_new (gtk_widget_get_parent_window (widget), 
+                                       &attributes, attributes_mask);
+  gdk_window_set_user_data (priv->input_window, ruler);
 
+  sp_ruler_make_pixmap (ruler);
+}
 
-static void sp_ruler_realize(GtkWidget *widget)
+static void
+sp_ruler_unrealize(GtkWidget *widget)
 {
-  GtkAllocation allocation;
-  SPRuler *ruler;
-  GdkWindow *window;
-  GdkWindowAttr attributes;
-  gint attributes_mask;
+  SPRuler        *ruler = SP_RULER (widget);
+  SPRulerPrivate *priv  = SP_RULER_GET_PRIVATE (ruler);
 
-  ruler = SP_RULER (widget);
+  if (priv->backing_store)
+    {
+      cairo_surface_destroy (priv->backing_store);
+      priv->backing_store = NULL;
+    }
+  
+  if (priv->layout)
+    {
+      g_object_unref (priv->layout);
+      priv->layout = NULL;
+    }
 
-  gtk_widget_set_realized (widget, TRUE);
+  if (priv->input_window)
+    {
+      gdk_window_destroy (priv->input_window);
+      priv->input_window = NULL;
+    }
 
-  gtk_widget_get_allocation(widget, &allocation);
+  GTK_WIDGET_CLASS (sp_ruler_parent_class)->unrealize (widget);
+}
 
-  attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.x = allocation.x;
-  attributes.y = allocation.y;
-  attributes.width = allocation.width;
-  attributes.height = allocation.height;
-  attributes.wclass = GDK_INPUT_OUTPUT;
-  attributes.visual = gtk_widget_get_visual (widget);
-  attributes.event_mask = gtk_widget_get_events (widget);
-  attributes.event_mask |= (GDK_EXPOSURE_MASK |
-			    GDK_POINTER_MOTION_MASK |
-			    GDK_POINTER_MOTION_HINT_MASK);
-
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
-
-  window = gdk_window_new(gtk_widget_get_parent_window (widget), 
-		          &attributes, attributes_mask);
-  gtk_widget_set_window(widget, window);
-  gdk_window_set_user_data(window, ruler);
+static void
+sp_ruler_map (GtkWidget *widget)
+{
+  SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget);
 
-#if GTK_CHECK_VERSION(3,0,0)
-  gtk_style_context_set_background(gtk_widget_get_style_context(widget),
-                                   window);
-#else
-  gtk_widget_style_attach(widget);
-  gtk_style_set_background(gtk_widget_get_style(widget),
-		           window, GTK_STATE_ACTIVE);
-#endif
+  GTK_WIDGET_CLASS (sp_ruler_parent_class)->map (widget);
 
-  sp_ruler_make_pixmap (ruler);
+  if (priv->input_window)
+    gdk_window_show (priv->input_window);
 }
 
-static void sp_ruler_unrealize(GtkWidget *widget)
+static void
+sp_ruler_unmap (GtkWidget *widget)
 {
-  SPRuler *ruler = SP_RULER (widget);
-  SPRulerPrivate *priv = ruler->priv;
+  SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget);
 
-  if (priv->backing_store)
+  if (priv->input_window)
+    gdk_window_hide (priv->input_window);
+  
+  GTK_WIDGET_CLASS (sp_ruler_parent_class)->unmap (widget);
+}
+
+static void
+sp_ruler_size_allocate (GtkWidget     *widget,
+                        GtkAllocation *allocation)
+{
+  SPRuler        *ruler = SP_RULER(widget);
+  SPRulerPrivate *priv  = SP_RULER_GET_PRIVATE (ruler);
+  GtkAllocation   widget_allocation;
+  gboolean        resized;
+
+  gtk_widget_get_allocation (widget, &widget_allocation);
+  
+  resized = (widget_allocation.width  != allocation->width ||
+             widget_allocation.height != allocation->height);
+
+  gtk_widget_set_allocation(widget, allocation);
+
+  if (gtk_widget_get_realized (widget))
     {
-#if GTK_CHECK_VERSION(3,0,0)
-      cairo_surface_destroy(priv->backing_store);
-#else
-      g_object_unref(priv->backing_store);
-#endif
-      priv->backing_store = NULL;
+      gdk_window_move_resize (priv->input_window,
+                              allocation->x, allocation->y,
+                              allocation->width, allocation->height);
+      
+      if (resized)
+        sp_ruler_make_pixmap (ruler);
     }
-
-  GTK_WIDGET_CLASS (sp_ruler_parent_class)->unrealize (widget);
 }
 
-static void sp_ruler_size_request(GtkWidget *widget, 
-		                  GtkRequisition *requisition)
+static void
+sp_ruler_size_request (GtkWidget      *widget, 
+                       GtkRequisition *requisition)
 {
-  SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget);
-  GtkStyle *style = gtk_widget_get_style(widget);
+  SPRulerPrivate  *priv    = SP_RULER_GET_PRIVATE (widget);
+  PangoLayout     *layout;
+  PangoRectangle   ink_rect;
+  gint             size;
+
+  layout = sp_ruler_get_layout (widget, "0123456789");
+  pango_layout_get_pixel_extents (layout, &ink_rect, NULL);
+
+  size = 2 + ink_rect.height * 1.7;
+
+#if GTK_CHECK_VERSION(3,0,0)
+  GtkStyleContext *context = gtk_widget_get_style_context (widget);
+  GtkBorder        border;
+
+  gtk_style_context_get_border (context, static_cast<GtkStateFlags>(0), &border);
+  
+  requisition->width  = border.left + border.right;
+  requisition->height = border.top  + border.bottom;
+#else
+  GtkStyle        *style   = gtk_widget_get_style(widget);
+#endif
 
   if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
     {
+#if GTK_CHECK_VERSION(3,0,0)
+      requisition->width  += 1;
+      requisition->height += size;
+#else
       requisition->width  = style->xthickness * 2 + 1;
-      requisition->height = style->ythickness * 2 + RULER_WIDTH;
+      requisition->height = style->ythickness * 2 + size;
+#endif
     }
   else
     {
-      requisition->width  = style->xthickness * 2 + RULER_WIDTH;
+#if GTK_CHECK_VERSION(3,0,0)
+      requisition->width  += size;
+      requisition->height += 1;
+#else
+      requisition->width  = style->xthickness * 2 + size;
       requisition->height = style->ythickness * 2 + 1;
+#endif
     }
 }
 
+static void
 #if GTK_CHECK_VERSION(3,0,0)
-static void sp_ruler_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width)
+sp_ruler_style_updated (GtkWidget *widget)
+#else
+sp_ruler_style_set (GtkWidget *widget,
+                    GtkStyle  *prev_style)
+#endif
 {
-	GtkRequisition requisition;
-	sp_ruler_size_request(widget, &requisition);
-	*minimal_width = *natural_width = requisition.width;
+  SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget);
+
+#if GTK_CHECK_VERSION(3,0,0)
+  GTK_WIDGET_CLASS (sp_ruler_parent_class)->style_updated (widget);
+#else
+  GTK_WIDGET_CLASS (sp_ruler_parent_class)->style_set (widget, prev_style);
+#endif
+
+  gtk_widget_style_get (widget,
+		        "font-scale", &priv->font_scale,
+			NULL);
+
+  if (priv->layout)
+    {
+     g_object_unref (priv->layout);
+     priv->layout = NULL;
+    }
 }
 
-static void sp_ruler_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height)
+#if GTK_CHECK_VERSION(3,0,0)
+static void
+sp_ruler_get_preferred_width (GtkWidget *widget,
+                              gint      *minimum_width,
+                              gint      *natural_width)
 {
-	GtkRequisition requisition;
-	sp_ruler_size_request(widget, &requisition);
-	*minimal_height = *natural_height = requisition.height;
+  GtkRequisition requisition;
+
+  sp_ruler_size_request (widget, &requisition);
+
+  *minimum_width = *natural_width = requisition.width;
 }
-#endif
 
-static void sp_ruler_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
+static void
+sp_ruler_get_preferred_height (GtkWidget *widget,
+                               gint      *minimum_height,
+                               gint      *natural_height)
 {
-  SPRuler *ruler = SP_RULER(widget);
-  GtkAllocation old_allocation;
-  gtk_widget_get_allocation(widget, &old_allocation);
+  GtkRequisition requisition;
+  
+  sp_ruler_size_request(widget, &requisition);
+  
+  *minimum_height = *natural_height = requisition.height;
+}
+#else
+static gboolean
+sp_ruler_expose (GtkWidget *widget,
+                 GdkEventExpose *event)
+{
+    cairo_t        *cr    = gdk_cairo_create(gtk_widget_get_window(widget));
+    GtkAllocation   allocation;
+  
+    gdk_cairo_region (cr, event->region);
+    cairo_clip (cr);
 
-  gboolean resized = (old_allocation.width != allocation->width ||
-		      old_allocation.height != allocation->height);
+    gtk_widget_get_allocation (widget, &allocation);
+    cairo_translate (cr, allocation.x, allocation.y);
 
-  gtk_widget_set_allocation(widget, allocation);
+    gboolean result = sp_ruler_draw (widget, cr);
 
-  if (gtk_widget_get_realized (widget))
-    {
-      gdk_window_move_resize(gtk_widget_get_window(widget),
-			     allocation->x, allocation->y,
-			     allocation->width, allocation->height);
+    cairo_destroy (cr);
 
-      if(resized)
-        sp_ruler_make_pixmap (ruler);
-    }
+    return result;
 }
-
-#if GTK_CHECK_VERSION(3,0,0)
-static gboolean sp_ruler_draw(GtkWidget *widget,
-		              cairo_t *cr)
-#else
-static gboolean sp_ruler_expose(GtkWidget *widget,
-                                GdkEventExpose *event)
 #endif
+
+static gboolean
+sp_ruler_draw (GtkWidget *widget,
+	       cairo_t *cr)
 {
-  SPRuler *ruler = SP_RULER (widget);
-  SPRulerPrivate *priv = ruler->priv;
+  SPRuler        *ruler = SP_RULER (widget);
+  SPRulerPrivate *priv  = SP_RULER_GET_PRIVATE (ruler);
+
+  sp_ruler_draw_ticks (ruler);
 
-#if GTK_CHECK_VERSION(3,0,0)
   cairo_set_source_surface(cr, priv->backing_store, 0, 0);
   cairo_paint(cr);
-#else
-  cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(widget));
-  gdk_cairo_set_source_pixmap(cr, priv->backing_store, 0, 0);
-  gdk_cairo_region(cr, event->region);
-  cairo_fill(cr);
-#endif
-
-  if (SP_RULER_GET_CLASS(ruler)->draw_pos)
-    SP_RULER_GET_CLASS(ruler)->draw_pos(ruler, cr);
 
-#if !GTK_CHECK_VERSION(3,0,0)
-  cairo_destroy (cr);
-#endif
+  sp_ruler_draw_pos (ruler);
 
   return FALSE;
 }
 
-static void sp_ruler_make_pixmap(SPRuler *ruler)
+static void
+sp_ruler_make_pixmap (SPRuler *ruler)
 {
-  SPRulerPrivate *priv = ruler->priv;
-  GtkWidget *widget = GTK_WIDGET(ruler);
+  GtkWidget      *widget = GTK_WIDGET (ruler);
+  SPRulerPrivate *priv   = SP_RULER_GET_PRIVATE (ruler);
+  GtkAllocation   allocation;
 
-  GtkAllocation allocation;
   gtk_widget_get_allocation(widget, &allocation);
 
   if (priv->backing_store)
-#if GTK_CHECK_VERSION(3,0,0)
-      cairo_surface_destroy(priv->backing_store);
-
-  priv->backing_store = gdk_window_create_similar_surface(gtk_widget_get_window(widget),
-		                                          CAIRO_CONTENT_COLOR,
-							  allocation.width,
-							  allocation.height);
-#else
-      g_object_unref(priv->backing_store);
-
-  priv->backing_store = gdk_pixmap_new(gtk_widget_get_window(widget),
-				       allocation.width,
-				       allocation.height,
-				       -1);
-#endif
-
-  priv->xsrc = 0;
-  priv->ysrc = 0;
+      cairo_surface_destroy (priv->backing_store);
 
-  sp_ruler_draw_ticks(ruler);
+  priv->backing_store = 
+    gdk_window_create_similar_surface (gtk_widget_get_window (widget),
+                                       CAIRO_CONTENT_COLOR,
+                                       allocation.width,
+                                       allocation.height);
 }
 
-
-static void sp_ruler_real_draw_pos(SPRuler *ruler,
-                                   cairo_t *cr)
+static void
+sp_ruler_draw_pos (SPRuler *ruler)
 {
-  GtkAllocation allocation;
-  GtkWidget *widget = GTK_WIDGET (ruler);
-  SPRulerPrivate *priv = ruler->priv;
-  gint x, y;
-  gint bs_width, bs_height;
-  gdouble increment;
+  GtkWidget       *widget  = GTK_WIDGET (ruler);
+
+#if GTK_CHECK_VERSION(3,0,0)
+  GtkStyleContext *context = gtk_widget_get_style_context (widget);
+  GtkBorder        border;
+  GdkRGBA          color;
+#else
+  GtkStyle        *style   = gtk_widget_get_style (widget);
+  GtkStateType     state   = gtk_widget_get_state (widget);
+  gint             xthickness;
+  gint             ythickness;
+#endif
+  
+  SPRulerPrivate  *priv    = SP_RULER_GET_PRIVATE (ruler);
+  GtkAllocation    allocation;
+  gint             x, y;
+  gint             width, height;
+  gint             bs_width, bs_height;
+
+  if (! gtk_widget_is_drawable (widget))
+      return;
 
-  GtkStyle *style = gtk_widget_get_style(widget);
   gtk_widget_get_allocation(widget, &allocation);
 
-  gint xthickness = style->xthickness;
-  gint ythickness = style->ythickness;
-  gint width = allocation.width;
-  gint height = allocation.height;
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_style_context_get_border (context, static_cast<GtkStateFlags>(0), &border);
+#else
+  xthickness = style->xthickness;
+  ythickness = style->ythickness;
+#endif
 
   if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
     {
-      height -= ythickness * 2;
+      width  = allocation.width;
+#if GTK_CHECK_VERSION(3,0,0)
+      height = allocation.height - (border.top + border.bottom);
+#else
+      height = allocation.height - ythickness * 2;
+#endif
 
       bs_width = height / 2 + 2;
       bs_width |= 1;  /* make sure it's odd */
@@ -666,7 +777,12 @@ static void sp_ruler_real_draw_pos(SPRuler *ruler,
     }
   else
     {
-      width -= xthickness * 2;
+#if GTK_CHECK_VERSION(3,0,0)
+      width  = allocation.width - (border.left + border.right);
+#else
+      width  = allocation.width - xthickness * 2;
+#endif
+      height = allocation.height;
 
       bs_height = width / 2 + 2;
       bs_height |= 1;  /* make sure it's odd */
@@ -675,28 +791,62 @@ static void sp_ruler_real_draw_pos(SPRuler *ruler,
 
   if ((bs_width > 0) && (bs_height > 0))
     {
+      cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
+      gdouble lower;
+      gdouble upper;
+      gdouble position;
+      gdouble increment;
+
+      cairo_rectangle (cr,
+                       allocation.x, allocation.y,
+                       allocation.width, allocation.height);
+      cairo_clip (cr);
+
+      cairo_translate (cr, allocation.x, allocation.y);
+
+      /* If a backing store exists, restore the ruler  */
+      if (priv->backing_store)
+        {
+          cairo_set_source_surface (cr, priv->backing_store, 0, 0);
+          cairo_rectangle (cr, priv->xsrc, priv->ysrc, bs_width, bs_height);
+          cairo_fill (cr);
+        }
+
+      position = sp_ruler_get_position (ruler);
+
+      sp_ruler_get_range (ruler, &lower, &upper, NULL);
+
       if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
         {
-          increment = (gdouble) width / (priv->upper - priv->lower);
+          increment = (gdouble) width / (upper - lower);
 
-          x = ROUND ((priv->position - priv->lower) * increment) + (xthickness - bs_width) / 2 - 1;
+#if GTK_CHECK_VERSION(3,0,0)
+          x = ROUND ((position - lower) * increment) + (border.left - bs_width) / 2 - 1;
+          y = (height + bs_height) / 2 + border.top;
+#else
+          x = ROUND ((position - lower) * increment) + (xthickness - bs_width) / 2 - 1;
           y = (height + bs_height) / 2 + ythickness;
+#endif
         }
       else
         {
-          increment = (gdouble) height / (priv->upper - priv->lower);
+          increment = (gdouble) height / (upper - lower);
 
+#if GTK_CHECK_VERSION(3,0,0)
+          x = (width + bs_width) / 2 + border.left;
+          y = ROUND ((position - lower) * increment) + (border.top - bs_height) / 2 - 1;
+#else
           x = (width + bs_width) / 2 + xthickness;
-          y = ROUND ((priv->position - priv->lower) * increment) + (ythickness - bs_height) / 2 - 1;
+          y = ROUND ((position - lower) * increment) + (ythickness - bs_height) / 2 - 1;
+#endif
         }
 
 #if GTK_CHECK_VERSION(3,0,0)
-      GtkStyleContext *sc = gtk_widget_get_style_context(widget);
-      GdkRGBA color;
-      gtk_style_context_get_color(sc, gtk_widget_get_state_flags(widget), &color);
-      gdk_cairo_set_source_rgba(cr, &color);
+      gtk_style_context_get_color (context, gtk_widget_get_state_flags (widget),
+                                   &color);
+      gdk_cairo_set_source_rgba (cr, &color);
 #else
-      gdk_cairo_set_source_color(cr, &style->fg[gtk_widget_get_state(widget)]);
+      gdk_cairo_set_source_color (cr, &style->fg[state]);
 #endif
 
       cairo_move_to (cr, x, y);
@@ -714,246 +864,636 @@ static void sp_ruler_real_draw_pos(SPRuler *ruler,
 
       cairo_fill (cr);
 
+      cairo_destroy (cr);
+
       priv->xsrc = x;
       priv->ysrc = y;
     }
 }
 
+/**
+ * sp_ruler_new:
+ * @orientation: the ruler's orientation
+ *
+ * Creates a new ruler.
+ *
+ * Return value: a new #SPRuler widget.
+ */
+GtkWidget *
+sp_ruler_new (GtkOrientation orientation)
+{
+  return GTK_WIDGET (g_object_new (SP_TYPE_RULER, 
+		                   "orientation", orientation,
+                                   NULL));
+}
 
-#define UNUSED_PIXELS         2     // There appear to be two pixels that are not being used at each end of the ruler
+static void
+sp_ruler_update_position (SPRuler *ruler,
+                          gdouble  x,
+                          gdouble  y)
+{
+  SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler);
+  GtkAllocation   allocation;
+  gdouble         lower;
+  gdouble         upper;
+
+  gtk_widget_get_allocation (GTK_WIDGET (ruler), &allocation);
+  sp_ruler_get_range (ruler, &lower, &upper, NULL);
 
-GtkWidget* sp_ruler_new(GtkOrientation orientation)
+  if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+    {
+     sp_ruler_set_position (ruler,
+                            lower +
+                            (upper - lower) * x / allocation.width);
+    }
+  else
+    {
+     sp_ruler_set_position (ruler,
+                            lower +
+                            (upper - lower) * y / allocation.height);
+    }
+}
+
+/* Returns TRUE if a translation should be done */
+static gboolean
+gtk_widget_get_translation_to_window (GtkWidget *widget,
+		                      GdkWindow *window,
+				      int       *x,
+				      int       *y)
 {
-  return GTK_WIDGET(g_object_new(SP_TYPE_RULER, 
-		                 "orientation", orientation,
-		                 NULL));
+  GdkWindow *w, *widget_window;
+
+  if (! gtk_widget_get_has_window (widget))
+    {
+      GtkAllocation allocation;
+
+      gtk_widget_get_allocation (widget, &allocation);
+
+      *x = -allocation.x;
+      *y = -allocation.y;
+    }
+  else
+    {
+      *x = 0;
+      *y = 0;
+    }
+
+  widget_window = gtk_widget_get_window (widget);
+
+  for (w = window;
+       w && w != widget_window;
+       w = gdk_window_get_effective_parent (w))
+    {
+      gdouble px, py;
+
+      gdk_window_coords_to_parent (w, *x, *y, &px, &py);
+
+      *x += px;
+      *y += px;
+    }
+
+  if (w == NULL)
+    {
+      *x = 0;
+      *y = 0;
+      return FALSE;
+    }
+
+  return TRUE;
 }
 
-static gboolean sp_ruler_motion_notify(GtkWidget      *widget,
-			               GdkEventMotion *event)
+static void
+sp_ruler_event_to_widget_coords (GtkWidget *widget,
+		                 GdkWindow *window,
+				 gdouble    event_x,
+				 gdouble    event_y,
+				 gint      *widget_x,
+				 gint      *widget_y)
 {
-  GtkAllocation  allocation;
-  SPRuler *ruler = SP_RULER(widget);
-  SPRulerPrivate *priv = ruler->priv;
-  
-  gdk_event_request_motions(event);
-  gint x = event->x;
-  gint y = event->y;
-  
-  gtk_widget_get_allocation(widget, &allocation);
+  gint tx, ty;
+
+  if (gtk_widget_get_translation_to_window (widget, window, &tx, &ty))
+    {
+      event_x += tx;
+      event_y += ty;
+    }
+
+  *widget_x = event_x;
+  *widget_y = event_y;
+}
+
+static gboolean
+sp_ruler_track_widget_motion_notify (GtkWidget      *widget,
+		                     GdkEventMotion *mevent,
+				     SPRuler        *ruler)
+{
+  gint widget_x;
+  gint widget_y;
+  gint ruler_x;
+  gint ruler_y;
+
+  widget = gtk_get_event_widget (reinterpret_cast<GdkEvent *>(mevent));
+
+  sp_ruler_event_to_widget_coords (widget, mevent->window,
+		                   mevent->x,  mevent->y,
+				   &widget_x, &widget_y);
+
+  if (gtk_widget_translate_coordinates (widget, GTK_WIDGET (ruler),
+			                widget_x, widget_y,
+					&ruler_x, &ruler_y))
+    {
+      sp_ruler_update_position (ruler, ruler_x, ruler_y);
+    }
+
+  return FALSE;  
+}
+
+void
+sp_ruler_add_track_widget (SPRuler   *ruler,
+		           GtkWidget *widget)
+{
+  SPRulerPrivate *priv;
+
+  g_return_if_fail (SP_IS_RULER   (ruler));
+  g_return_if_fail (GTK_IS_WIDGET (ruler));
+
+  priv = SP_RULER_GET_PRIVATE (ruler);
   
-  if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
-    priv->position = priv->lower + (priv->upper - priv->lower) * (x + UNUSED_PIXELS) / (allocation.width + 2*UNUSED_PIXELS);
-  else
-    priv->position = priv->lower + (priv->upper - priv->lower) * (y + UNUSED_PIXELS) / (allocation.height + 2*UNUSED_PIXELS);
+  g_return_if_fail (g_list_find (priv->track_widgets, widget) == NULL);
 
-  g_object_notify(G_OBJECT(ruler), "position");
+  priv->track_widgets = g_list_prepend (priv->track_widgets, widget);
 
-  gtk_widget_queue_draw(widget);
+  g_signal_connect (widget, "motion-notify-event",
+		    G_CALLBACK (sp_ruler_track_widget_motion_notify),
+		    ruler);
+  g_signal_connect (widget, "destroy",
+		    G_CALLBACK (sp_ruler_remove_track_widget),
+		    ruler);
+}
 
-  return FALSE;
+/**
+ * sp_ruler_remove_track_widget:
+ * @ruler: an #SPRuler
+ * @widget: the track widget to remove
+ *
+ * Removes a previously added track widget from the ruler. See
+ * sp_ruler_add_track_widget().
+ */
+void
+sp_ruler_remove_track_widget (SPRuler   *ruler,
+		              GtkWidget *widget)
+{
+  SPRulerPrivate *priv;
+
+  g_return_if_fail (SP_IS_RULER   (ruler));
+  g_return_if_fail (GTK_IS_WIDGET (ruler));
+
+  priv = SP_RULER_GET_PRIVATE (ruler);
+
+  g_return_if_fail (g_list_find (priv->track_widgets, widget) != NULL);
+
+  priv->track_widgets = g_list_remove (priv->track_widgets, widget);
+
+  g_signal_handlers_disconnect_by_func (widget,
+		                        (gpointer) G_CALLBACK (sp_ruler_track_widget_motion_notify),
+					ruler);
+  g_signal_handlers_disconnect_by_func (widget,
+		                        (gpointer) G_CALLBACK (sp_ruler_remove_track_widget),
+					ruler);
 }
 
-static void sp_ruler_real_draw_ticks(SPRuler *ruler, cairo_t *cr)
+/**
+ * sp_ruler_set_unit:
+ * @ruler: a #SPRuler
+ * @unit: the #SPMetric to set the ruler to
+ *
+ * This sets the unit of the ruler.
+ */
+void
+sp_ruler_set_unit (SPRuler  *ruler,
+                   SPMetric  unit)
 {
-    SPRulerPrivate *priv = ruler->priv;
-    gint width = 0;
-    gint height = 0;
-    gchar unit_str[32];
-    gchar digit_str[2] = { '\0', '\0' };
-    GtkOrientation orientation;
-    GtkAllocation allocation;
+  SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler);
+  
+  g_return_if_fail (SP_IS_RULER (ruler));
 
-    g_return_if_fail (ruler != NULL);
+  if (priv->unit != unit)
+    {
+      priv->unit = unit;
+      g_object_notify(G_OBJECT(ruler), "unit");
 
-    g_object_get(G_OBJECT(ruler), "orientation", &orientation, NULL);
-    GtkWidget *widget = GTK_WIDGET (ruler);
+      gtk_widget_queue_draw (GTK_WIDGET (ruler));
+    }
+}
 
-    PangoContext *pango_context = gtk_widget_get_pango_context (widget);
-    PangoLayout  *pango_layout = pango_layout_new (pango_context);
-    PangoFontDescription *fs = pango_font_description_new ();
-    pango_font_description_set_size (fs, RULER_FONT_SIZE);
-    pango_layout_set_font_description (pango_layout, fs);
-    pango_font_description_free (fs);
+/**
+ * sp_ruler_get_unit:
+ * @ruler: a #SPRuler
+ *
+ * Return value: the unit currently used in the @ruler widget.
+ **/
+SPMetric
+sp_ruler_get_unit (SPRuler *ruler)
+{
+  g_return_val_if_fail(SP_IS_RULER(ruler), static_cast<SPMetric>(0));
+
+  return SP_RULER_GET_PRIVATE (ruler)->unit;
+}
+
+/**
+ * sp_ruler_set_position:
+ * @ruler: a #SPRuler
+ * @position: the position to set the ruler to
+ *
+ * This sets the position of the ruler.
+ */
+void
+sp_ruler_set_position (SPRuler *ruler,
+                       gdouble  position)
+{
+    SPRulerPrivate *priv;
 
-    gint digit_height = (int) floor (RULER_FONT_SIZE * RULER_FONT_VERTICAL_SPACING / PANGO_SCALE + 0.5);
+    g_return_if_fail (SP_IS_RULER (ruler));
     
+    priv = SP_RULER_GET_PRIVATE (ruler);
+
+    if (priv->position != position)
+    {
+        priv->position = position;
+        g_object_notify (G_OBJECT (ruler), "position");
+
+        sp_ruler_draw_pos (ruler);
+    }
+}
+
+/**
+ * sp_ruler_get_position:
+ * @ruler: a #SPRuler
+ *
+ * Return value: the current position of the @ruler widget.
+ */
+gdouble
+sp_ruler_get_position (SPRuler *ruler)
+{
+    g_return_val_if_fail (SP_IS_RULER (ruler), 0.0);
+
+    return SP_RULER_GET_PRIVATE (ruler)->position;
+}
+
+static gboolean
+sp_ruler_motion_notify (GtkWidget      *widget,
+		        GdkEventMotion *event)
+{
+  SPRuler *ruler = SP_RULER(widget);
+
+  sp_ruler_update_position (ruler, event->x, event->y);
+
+  return FALSE;
+}
+
+static void
+sp_ruler_draw_ticks (SPRuler *ruler)
+{
+    GtkWidget       *widget  = GTK_WIDGET (ruler);
+
 #if GTK_CHECK_VERSION(3,0,0)
-    GtkStyleContext *context = gtk_widget_get_style_context(widget);
-    GtkStateFlags state = gtk_widget_get_state_flags(widget);
-    GtkBorder padding;
-    gtk_style_context_get_padding(context, state, &padding);
-    gint xthickness = padding.left;
-    gint ythickness = padding.top;
+    GtkStyleContext *context = gtk_widget_get_style_context (widget);
+    GtkBorder        border;
+    GdkRGBA          color;
 #else
-    GtkStyle  *style = gtk_widget_get_style(widget);
-    gint xthickness = style->xthickness;
-    gint ythickness = style->ythickness;
+    GtkStyle        *style   = gtk_widget_get_style (widget);
+    GtkStateType     state   = gtk_widget_get_state (widget);
+    gint             xthickness;
+    gint             ythickness;
 #endif
 
+    SPRulerPrivate  *priv    = SP_RULER_GET_PRIVATE (ruler);
+    GtkAllocation    allocation;
+    cairo_t         *cr;
+    gint             i;
+    gint             width, height;
+    gint             length, ideal_length;
+    gdouble          lower, upper; /* Upper and lower limits, in ruler units */
+    gdouble          increment;    /* Number of pixels per unit */
+    guint            scale;        /* Number of units per major unit */
+    gdouble          start, end, cur;
+    gchar            unit_str[32];
+    gint             digit_height;
+    gint             digit_offset;
+    gchar            digit_str[2] = { '\0', '\0' };
+    gint             text_size;
+    gint             pos;
+    gdouble          max_size;
+    SPMetric         unit;
+    SPRulerMetric    ruler_metric = ruler_metric_general; /* The metric to use for this unit system */
+    PangoLayout     *layout;
+    PangoRectangle   logical_rect, ink_rect;
+
+    if (! gtk_widget_is_drawable (widget))
+      return;
+
     gtk_widget_get_allocation (widget, &allocation);
+
+#if GTK_CHECK_VERSION(3,0,0)
+    gtk_style_context_get_border (context, static_cast<GtkStateFlags>(0), &border);
+#else
+    xthickness = style->xthickness;
+    ythickness = style->ythickness;
+#endif
+
+    layout = sp_ruler_get_layout (widget, "0123456789");
+    pango_layout_get_extents (layout, &ink_rect, &logical_rect);
     
-    if (orientation == GTK_ORIENTATION_HORIZONTAL) {
-        width = allocation.width; // in pixels; is apparently 2 pixels shorter than the canvas at each end
-        height = allocation.height;
-    } else {
-        width = allocation.height;
-        height = allocation.width;
-    }
+    digit_height = PANGO_PIXELS (ink_rect.height) + 2;
+    digit_offset = ink_rect.y;
     
+    if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+     {
+        width = allocation.width;
 #if GTK_CHECK_VERSION(3,0,0)
-    gtk_render_frame(context, 
-                     cr,
-		     0, 0, 
-		     allocation.width, allocation.height);
-    
-    gtk_render_background(context, 
-                          cr,
-			  0, 0, 
-			  allocation.width, allocation.height);
+        height = allocation.height - (border.top + border.bottom);
 #else
-    gtk_paint_box(style, priv->backing_store,
-                  GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, widget,
-                  orientation == GTK_ORIENTATION_HORIZONTAL ? "hruler" : "vruler",
-                  0, 0, 
-                  allocation.width, allocation.height);
+        height = allocation.height - ythickness * 2;
 #endif
-    
-    cairo_set_line_width(cr, 1.0);
+     }
+    else
+     {
+        width = allocation.height;
+#if GTK_CHECK_VERSION(3,0,0)
+        height = allocation.width - (border.top + border.bottom);
+#else
+        height = allocation.width - ythickness * 2;
+#endif
+     }
 
+    cr = cairo_create (priv->backing_store);
+    
 #if GTK_CHECK_VERSION(3,0,0)
-    GdkRGBA color;
-    gtk_style_context_get_color(context,
-                                gtk_widget_get_state_flags(widget),
-                                &color);
-    gdk_cairo_set_source_rgba(cr, &color);
+    gtk_render_background (context, cr, 0, 0, allocation.width, allocation.height);
+    gtk_render_frame (context, cr, 0, 0, allocation.width, allocation.height);
+    
+    gtk_style_context_get_color (context, gtk_widget_get_state_flags (widget),
+                                 &color);
+    gdk_cairo_set_source_rgba (cr, &color);
+
+    if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+      {
+        cairo_rectangle (cr,
+                         border.left,
+                         height + border.top,
+                         allocation.width - (border.left + border.right),
+                         1);      
+      }
+    else
+      {
+        cairo_rectangle (cr,
+                         height + border.left,
+                         border.top,
+                         1,
+                         allocation.height - (border.top + border.bottom));
+      }
 #else
-    gdk_cairo_set_source_color(cr, &style->fg[gtk_widget_get_state(widget)]);
+    gdk_cairo_set_source_color (cr, &style->bg[state]);
+    
+    cairo_paint (cr);
+    
+    gdk_cairo_set_source_color(cr, &style->fg[state]);
+
+    if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+      {
+        cairo_rectangle (cr,
+                         xthickness,
+                         height + ythickness,
+                         allocation.width - 2 * xthickness,
+                         1);      
+      }
+    else
+      {
+        cairo_rectangle (cr,
+                         height + xthickness,
+                         ythickness,
+                         1,
+                         allocation.height - 2 * ythickness);
+      }
 #endif
 
-    gdouble upper = priv->upper / priv->metric->pixels_per_unit; // upper and lower are expressed in ruler units
-    gdouble lower = priv->lower / priv->metric->pixels_per_unit;
-    /* "pixels_per_unit" should be "points_per_unit". This is the size of the unit
-    * in 1/72nd's of an inch and has nothing to do with screen pixels */
+    sp_ruler_get_range (ruler, &lower, &upper, &max_size);
 
     if ((upper - lower) == 0)
-        return;
+        goto out;
 
-    double increment = (double) (width + 2*UNUSED_PIXELS) / (upper - lower); // screen pixels per ruler unit
+    increment = (gdouble) width / (upper - lower);
 
     /* determine the scale
-    *  For vruler, use the maximum extents of the ruler to determine the largest
-    *  possible number to be displayed.  Calculate the height in pixels
-    *  of this displayed text. Use this height to find a scale which
-    *  leaves sufficient room for drawing the ruler.
-    *  For hruler, we calculate the text size as for the vruler instead of using
-    *  text_width = gdk_string_width(font, unit_str), so that the result
-    *  for the scale looks consistent with an accompanying vruler
+    *    Use the maximum extents of the ruler to determine the largest
+    *    possible number to be displayed.  Calculate the height in pixels
+    *    of this displayed text. Use this height to find a scale which
+    *    leaves sufficient room for drawing the ruler.
+    *
+    *    We calculate the text size as for the vruler instead of
+    *    actually measuring the text width, so that the result for the
+    *    scale looks consistent with an accompanying vruler
     */
-    gint scale = (int)(ceil(priv->max_size / priv->metric->pixels_per_unit));
+    scale = ceil (priv->max_size);
     sprintf (unit_str, "%d", scale);
-    gint text_dimension = strlen (unit_str) * digit_height + 1;
+    text_size = strlen (unit_str) * digit_height + 1;
+
+    /* Inkscape change to ruler: Use a 1,2,4,8... scale for inches
+     * or a 1,2,5,10... scale for everything else */
+    if (sp_ruler_get_unit (ruler) == SP_IN)
+      ruler_metric = ruler_metric_inches;
 
-    for (scale = 0; scale < MAXIMUM_SCALES; scale++)
-        if (priv->metric->ruler_scale[scale] * fabs(increment) > 2 * text_dimension)
+    for (scale = 0; scale < G_N_ELEMENTS (ruler_metric.ruler_scale); scale++)
+        if (ruler_metric.ruler_scale[scale] * fabs (increment) > 2 * text_size)
             break;
 
-    if (scale == MAXIMUM_SCALES)
-        scale = MAXIMUM_SCALES - 1;
+    if (scale == G_N_ELEMENTS (ruler_metric.ruler_scale))
+        scale = G_N_ELEMENTS (ruler_metric.ruler_scale) - 1;
+
+    unit = sp_ruler_get_unit (ruler);
 
     /* drawing starts here */
-    gint length = 0;
-    for (gint i = MAXIMUM_SUBDIVIDE - 1; i >= 0; i--) {
-        double subd_incr = priv->metric->ruler_scale[scale] / 
-                    priv->metric->subdivide[i];
-        if (subd_incr * fabs(increment) <= MINIMUM_INCR) 
+    length = 0;
+    for (i = G_N_ELEMENTS (ruler_metric.subdivide) - 1; i >= 0; i--)
+      {
+        gdouble subd_incr;
+       
+        /* hack to get proper subdivisions at full pixels */
+        if (unit == SP_PX && scale == 1 && i == 1)
+          subd_incr = 1.0;
+        else
+          subd_incr = ((gdouble) ruler_metric.ruler_scale[scale] / 
+                       (gdouble) ruler_metric.subdivide[i]);
+
+        if (subd_incr * fabs (increment) <= MINIMUM_INCR) 
             continue;
 
         /* Calculate the length of the tickmarks. Make sure that
         * this length increases for each set of ticks
         */
-        gint ideal_length = height / (i + 1) - 1;
+        ideal_length = height / (i + 1) - 1;
         if (ideal_length > ++length)
             length = ideal_length;
 
-        gdouble start = 0;
-	gdouble end = 0;
-	if (lower < upper) {
+	if (lower < upper)
+          {
             start = floor (lower / subd_incr) * subd_incr;
             end   = ceil  (upper / subd_incr) * subd_incr;
-        } else {
+          }
+        else
+          {
             start = floor (upper / subd_incr) * subd_incr;
             end   = ceil  (lower / subd_incr) * subd_incr;
-        }
+          }
 
         gint tick_index = 0;
-        gdouble cur = start; // location (in ruler units) of the first invisible tick at the left side of the canvas 
 
-        while (cur <= end) {
+        for (cur = start; cur <= end; cur += subd_incr)
+          {
             // due to the typical values for cur, lower and increment, pos will often end up to
             // be e.g. 641.50000000000; rounding behaviour is not defined in such a case (see round.h)
             // and jitter will be apparent (upon redrawing some of the lines on the ruler might jump a
             // by a pixel, and jump back on the next redraw). This is suppressed by adding 1e-9 (that's only one nanopixel ;-))
-            gint pos = int(Inkscape::round((cur - lower) * increment + 1e-12)) - UNUSED_PIXELS;
+            pos = gint(Inkscape::round((cur - lower) * increment + 1e-12));
 
-            if (orientation == GTK_ORIENTATION_HORIZONTAL) {
-                cairo_move_to(cr, pos+0.5, height + ythickness);
-		cairo_line_to(cr, pos+0.5, height - length + ythickness);
-            } else {
-                cairo_move_to(cr, height + xthickness - length, pos+0.5);
-		cairo_line_to(cr, height + xthickness, pos+0.5);
-            }
+#if GTK_CHECK_VERSION(3,0,0)
+            if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+             {
+               cairo_rectangle (cr,
+                                pos, height + border.top - length,
+                                1,   length);
+             }
+            else 
+             {
+               cairo_rectangle (cr,
+                                height + border.left - length, pos,
+                                length,                        1);
+             }
+#else
+            if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+             {
+               cairo_rectangle (cr,
+                                pos, height + ythickness - length,
+                                1,   length);
+             }
+            else 
+             {
+               cairo_rectangle (cr,
+                                height + xthickness - length, pos,
+                                length,                       1);
+             }
+#endif
 
             /* draw label */
-            double label_spacing_px = fabs((increment*(double)priv->metric->ruler_scale[scale])/priv->metric->subdivide[i]);
+            double label_spacing_px = fabs(increment*(double)ruler_metric.ruler_scale[scale]/ruler_metric.subdivide[i]);
             if (i == 0 && 
                 (label_spacing_px > 6*digit_height || tick_index%2 == 0 || cur == 0) && 
                 (label_spacing_px > 3*digit_height || tick_index%4 == 0 || cur == 0))
-            {
+              {
                 if (fabs((int)cur) >= 2000 && (((int) cur)/1000)*1000 == ((int) cur))
                     sprintf (unit_str, "%dk", ((int) cur)/1000);
                 else
                     sprintf (unit_str, "%d", (int) cur);
 
-                if (orientation == GTK_ORIENTATION_HORIZONTAL) {
-                    pango_layout_set_text (pango_layout, unit_str, -1);
-		    cairo_move_to(cr, pos+2, 0);
-		    pango_cairo_show_layout(cr, pango_layout);
-                } else {
-                    for (gint j = 0; j < (int) strlen (unit_str); j++) {
+                if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+                  {
+                    pango_layout_set_text (layout, unit_str, -1);
+                    pango_layout_get_extents (layout, &logical_rect, NULL);
+
+#if GTK_CHECK_VERSION(3,0,0)
+		    cairo_move_to (cr,
+                                   pos + 2,
+                                   border.top + PANGO_PIXELS (logical_rect.y - digit_offset));
+#else
+		    cairo_move_to (cr,
+                                   pos + 2,
+                                   ythickness + PANGO_PIXELS (logical_rect.y - digit_offset));
+#endif
+
+		    pango_cairo_show_layout(cr, layout);
+                  }
+                else
+                  {
+                    gint j;
+
+                    for (j = 0; j < (int) strlen (unit_str); j++)
+                      {
                         digit_str[0] = unit_str[j];
-                        pango_layout_set_text (pango_layout, digit_str, 1);
-			cairo_move_to(cr, xthickness + 1, pos + digit_height * (j) + 1);
-			pango_cairo_show_layout(cr, pango_layout);
-                    }
-                }
-		
-            }
-            /* Calculate cur from start rather than incrementing by subd_incr
-            * in each iteration. This is to avoid propagation of floating point 
-            * errors in subd_incr.
-            */
+                        pango_layout_set_text (layout, digit_str, 1);
+                        pango_layout_get_extents (layout, NULL, &logical_rect);
+
+#if GTK_CHECK_VERSION(3,0,0)
+			cairo_move_to (cr,
+                                       border.left + 1,
+                                       pos + digit_height * j + 2 + PANGO_PIXELS (logical_rect.y - digit_offset));
+#else
+			cairo_move_to (cr,
+                                       xthickness + 1,
+                                       pos + digit_height * j + 2 + PANGO_PIXELS (logical_rect.y - digit_offset));
+#endif
+			pango_cairo_show_layout (cr, layout);
+                      }
+                  }
+              }
+        
             ++tick_index;
-            cur = start + tick_index * subd_incr;
-	    cairo_stroke(cr);
-        }
-    }
-}
+          }
+      }
 
+    cairo_fill (cr);
 
-void sp_ruler_set_metric(SPRuler *ruler, SPMetric metric)
+out:
+    cairo_destroy (cr);
+}
+
+static PangoLayout*
+sp_ruler_create_layout (GtkWidget   *widget,
+                        const gchar *text)
 {
-  g_return_if_fail(ruler != NULL);
-  g_return_if_fail(SP_IS_RULER (ruler));
-  g_return_if_fail((unsigned) metric < G_N_ELEMENTS(sp_ruler_metrics));
-  SPRulerPrivate *priv = ruler->priv;
+  SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget);
+  PangoLayout    *layout;
+  PangoAttrList  *attrs;
+  PangoAttribute *attr;
 
-  if (metric == 0) 
-	return;
+  layout = gtk_widget_create_pango_layout (widget, text);
 
-  priv->metric = const_cast<SPRulerMetric *>(&sp_ruler_metrics[metric]);
+  attrs = pango_attr_list_new ();
 
-  g_object_notify(G_OBJECT(ruler), "metric");
+  attr = pango_attr_scale_new (priv->font_scale);
+  attr->start_index = 0;
+  attr->end_index   = -1;
+  pango_attr_list_insert (attrs, attr);
 
-  sp_ruler_invalidate_ticks(ruler);
+  pango_layout_set_attributes (layout, attrs);
+  pango_attr_list_unref (attrs);
+
+  return layout;
+}
+
+static PangoLayout *
+sp_ruler_get_layout (GtkWidget   *widget,
+                     const gchar *text)
+{
+  SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget);
+
+  if (priv->layout)
+    {
+      pango_layout_set_text (priv->layout, text, -1);
+      return priv->layout;
+    }
+
+  priv->layout = sp_ruler_create_layout (widget, text);
+
+  return priv->layout;
 }
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/widgets/ruler.h b/src/widgets/ruler.h
index d4e21b300..f0d866fff 100644
--- a/src/widgets/ruler.h
+++ b/src/widgets/ruler.h
@@ -18,6 +18,8 @@
 #include <iostream>
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 #define SP_TYPE_RULER            (sp_ruler_get_type ())
 #define SP_RULER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_RULER, SPRuler))
 #define SP_RULER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SP_TYPE_RULER, SPRulerClass))
@@ -25,59 +27,45 @@
 #define SP_IS_RULER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_RULER))
 #define SP_RULER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), SP_TYPE_RULER, SPRulerClass))
 
-
 typedef struct _SPRuler         SPRuler;
-typedef struct _SPRulerPrivate  SPRulerPrivate;
 typedef struct _SPRulerClass    SPRulerClass;
-typedef struct _SPRulerMetric   SPRulerMetric;
 
-/* All distances below are in 1/72nd's of an inch. (According to
- * Adobe that's a point, but points are really 1/72.27 in.)
- */
 struct _SPRuler
 {
-  GtkWidget widget;
-
-  /*< private >*/
-  SPRulerPrivate *priv;
+  GtkWidget parent_instance;
 };
 
 struct _SPRulerClass
 {
   GtkWidgetClass parent_class;
-
-  void (* draw_ticks) (SPRuler *ruler,
-		       cairo_t *cr);
-  void (* draw_pos)   (SPRuler *ruler,
-		       cairo_t *cr);
 };
 
-struct _SPRulerMetric
-{
-  gchar const *metric_name;
-  gchar const *abbrev;
-  /* This should be points_per_unit. This is the size of the unit
-   * in 1/72nd's of an inch and has nothing to do with screen pixels */
-  gdouble pixels_per_unit;
-  gdouble ruler_scale[10];
-  gint subdivide[5];        /* five possible modes of subdivision */
-};
 
+GType           sp_ruler_get_type            (void) G_GNUC_CONST;
+
+GtkWidget*      sp_ruler_new                 (GtkOrientation  orientation);
+
+void            sp_ruler_add_track_widget    (SPRuler        *ruler,
+		                              GtkWidget      *widget);
+void            sp_ruler_remove_track_widget (SPRuler        *ruler,
+		                              GtkWidget      *widget);
+
+void            sp_ruler_set_unit            (SPRuler        *ruler,
+                                              SPMetric        unit);
+SPMetric        sp_ruler_get_unit            (SPRuler        *ruler);
+void            sp_ruler_set_position        (SPRuler        *ruler,
+                                              gdouble         set_position);
+gdouble         sp_ruler_get_position        (SPRuler        *ruler);
+void            sp_ruler_set_range           (SPRuler        *ruler,
+                                              gdouble         lower,
+                                              gdouble         upper,
+                                              gdouble         max_size);
+void            sp_ruler_get_range           (SPRuler        *ruler,
+                                              gdouble        *lower,
+                                              gdouble        *upper,
+                                              gdouble        *max_size);
 
-GType           sp_ruler_get_type   (void) G_GNUC_CONST;
-GtkWidget*      sp_ruler_new        (GtkOrientation  orientation);
-void            sp_ruler_set_range  (SPRuler        *ruler,
-                                     gdouble         lower,
-                                     gdouble         upper,
-                                     gdouble         position,
-                                     gdouble         max_size);
-void            sp_ruler_get_range  (SPRuler        *ruler,
-                                     gdouble        *lower,
-                                     gdouble        *upper,
-                                     gdouble        *position,
-                                     gdouble        *max_size);
-void     sp_ruler_set_metric(SPRuler *ruler, SPMetric  metric);
-SPMetric sp_ruler_get_metric(SPRuler *ruler);
+G_END_DECLS
 
 #endif /* __SP_RULER_H__ */
 
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index 3ccfa9cf9..549581610 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -88,13 +88,13 @@ sp_selection_layout_widget_update(SPWidget *spw, Inkscape::Selection *sel)
             if (unit.base == SP_UNIT_DIMENSIONLESS) {
                 double const val = 1. / unit.unittobase;
                 for (unsigned i = 0; i < G_N_ELEMENTS(keyval); ++i) {
-                    GtkAdjustment *a = (GtkAdjustment *) g_object_get_data(G_OBJECT(spw), keyval[i].key);
+                    GtkAdjustment *a = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(spw), keyval[i].key));
                     gtk_adjustment_set_value(a, val);
                     tracker->setFullVal( a, keyval[i].val );
                 }
             } else {
                 for (unsigned i = 0; i < G_N_ELEMENTS(keyval); ++i) {
-                    GtkAdjustment *a = (GtkAdjustment *) g_object_get_data(G_OBJECT(spw), keyval[i].key);
+                    GtkAdjustment *a = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(spw), keyval[i].key));
                     gtk_adjustment_set_value(a, sp_pixels_get_units(keyval[i].val, unit));
                 }
             }
diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp
index 80974c2e4..d89d35e9c 100644
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -104,12 +104,9 @@ sp_color_icc_selector_get_type (void)
 static void sp_color_icc_selector_class_init(SPColorICCSelectorClass *klass)
 {
     static const gchar* nameset[] = {N_("CMS"), 0};
-    GObjectClass *object_class = (GObjectClass *) klass;
-    GtkWidgetClass *widget_class;
-    SPColorSelectorClass *selector_class;
-
-    widget_class = (GtkWidgetClass *) klass;
-    selector_class = SP_COLOR_SELECTOR_CLASS (klass);
+    GObjectClass   *object_class = G_OBJECT_CLASS(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));
 
@@ -453,7 +450,7 @@ void ColorICCSelector::init()
 #endif
 
     /* Adjustment */
-    _adj = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 255.0, 1.0, 10.0, 10.0);
+    _adj = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 255.0, 1.0, 10.0, 10.0));
 
     /* Slider */
     _slider = sp_color_slider_new (_adj);
@@ -510,8 +507,8 @@ void ColorICCSelector::init()
 
 static void sp_color_icc_selector_dispose(GObject *object)
 {
-    if (((GObjectClass *) (parent_class))->dispose)
-        (* ((GObjectClass *) (parent_class))->dispose)(object);
+    if ((G_OBJECT_CLASS(parent_class))->dispose)
+        (* (G_OBJECT_CLASS(parent_class))->dispose)(object);
 }
 
 static void
@@ -672,7 +669,7 @@ void ColorICCSelector::_profilesChanged( std::string const & name )
 
     g_signal_handler_block( G_OBJECT(_profileSel), _profChangedID );
 
-    GtkListStore *store = (GtkListStore *)gtk_combo_box_get_model (combo);
+    GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(combo));
     gtk_list_store_clear(store);
 
     GtkTreeIter iter;
@@ -1008,7 +1005,7 @@ void ColorICCSelector::_adjustmentChanged( GtkAdjustment *adjustment, SPColorICC
 
 void ColorICCSelector::_sliderGrabbed( SPColorSlider */*slider*/, SPColorICCSelector */*cs*/ )
 {
-//    ColorICCSelector* iccSelector = (ColorICCSelector*)(SP_COLOR_SELECTOR(cs)->base);
+//    ColorICCSelector* iccSelector = dynamic_cast<ColorICCSelector*>(SP_COLOR_SELECTOR(cs)->base);
 //     if (!iccSelector->_dragging) {
 //         iccSelector->_dragging = TRUE;
 //         iccSelector->_grabbed();
@@ -1018,7 +1015,7 @@ void ColorICCSelector::_sliderGrabbed( SPColorSlider */*slider*/, SPColorICCSele
 
 void ColorICCSelector::_sliderReleased( SPColorSlider */*slider*/, SPColorICCSelector */*cs*/ )
 {
-//     ColorICCSelector* iccSelector = (ColorICCSelector*)(SP_COLOR_SELECTOR(cs)->base);
+//     ColorICCSelector* iccSelector = dynamic_cast<ColorICCSelector*>(SP_COLOR_SELECTOR(cs)->base);
 //     if (iccSelector->_dragging) {
 //         iccSelector->_dragging = FALSE;
 //         iccSelector->_released();
@@ -1035,7 +1032,7 @@ void ColorICCSelector::_sliderChanged( SPColorSlider */*slider*/, SPColorICCSele
 #ifdef DEBUG_LCMS
     g_message("Changed  %p and %p", slider, cs );
 #endif // DEBUG_LCMS
-//     ColorICCSelector* iccSelector = (ColorICCSelector*)(SP_COLOR_SELECTOR(cs)->base);
+//     ColorICCSelector* iccSelector = dynamic_cast<ColorICCSelector*>(SP_COLOR_SELECTOR(cs)->base);
 
 //     iccSelector->_updateInternals( iccSelector->_color, ColorScales::getScaled( iccSelector->_adj ), iccSelector->_dragging );
 }
diff --git a/src/widgets/sp-color-scales.cpp b/src/widgets/sp-color-scales.cpp
index 95c6d341d..c3f9d511c 100644
--- a/src/widgets/sp-color-scales.cpp
+++ b/src/widgets/sp-color-scales.cpp
@@ -78,12 +78,9 @@ static void
 sp_color_scales_class_init (SPColorScalesClass *klass)
 {
 	static const gchar* nameset[] = {N_("RGB"), N_("HSL"), N_("CMYK"), 0};
-	GObjectClass *object_class = (GObjectClass *) klass;
-	GtkWidgetClass *widget_class;
-	SPColorSelectorClass *selector_class;
-
-	widget_class = (GtkWidgetClass *) klass;
-	selector_class = SP_COLOR_SELECTOR_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS(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));
 
@@ -164,7 +161,7 @@ void ColorScales::init()
 #endif
 
 		/* Adjustment */
-		_a[i] = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, _rangeLimit, 1.0, 10.0, 10.0);
+		_a[i] = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, _rangeLimit, 1.0, 10.0, 10.0));
 		/* Slider */
 		_s[i] = sp_color_slider_new (_a[i]);
 		gtk_widget_show (_s[i]);
@@ -217,8 +214,8 @@ void ColorScales::init()
 
 static void sp_color_scales_dispose(GObject *object)
 {
-	if (((GObjectClass *) (parent_class))->dispose)
-		(* ((GObjectClass *) (parent_class))->dispose) (object);
+	if ((G_OBJECT_CLASS(parent_class))->dispose)
+		(* (G_OBJECT_CLASS(parent_class))->dispose) (object);
 }
 
 static void
@@ -466,7 +463,7 @@ void ColorScales::setMode(SPColorScalesMode mode)
 		gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_A:"));
 		gtk_widget_set_tooltip_text (_s[3], _("Alpha (opacity)"));
 		gtk_widget_set_tooltip_text (_b[3], _("Alpha (opacity)"));
-		sp_color_slider_set_map (SP_COLOR_SLIDER (_s[0]), (guchar*)sp_color_scales_hue_map ());
+		sp_color_slider_set_map (SP_COLOR_SLIDER (_s[0]), (guchar *)(sp_color_scales_hue_map()));
 		gtk_widget_hide (_l[4]);
 		gtk_widget_hide (_s[4]);
 		gtk_widget_hide (_b[4]);
diff --git a/src/widgets/sp-color-slider.cpp b/src/widgets/sp-color-slider.cpp
index 3ba748f2b..37cccda9f 100644
--- a/src/widgets/sp-color-slider.cpp
+++ b/src/widgets/sp-color-slider.cpp
@@ -86,12 +86,10 @@ sp_color_slider_get_type (void)
 
 static void sp_color_slider_class_init(SPColorSliderClass *klass)
 {
-	GObjectClass *object_class = (GObjectClass *) klass;
-	GtkWidgetClass *widget_class;
+	GObjectClass   *object_class = G_OBJECT_CLASS(klass);
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
 
-	widget_class = (GtkWidgetClass *) klass;
-
-	parent_class = (GtkWidgetClass*)g_type_class_peek_parent (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),
@@ -185,8 +183,8 @@ static void sp_color_slider_dispose(GObject *object)
 		slider->adjustment = NULL;
 	}
 
-	if (((GObjectClass *) (parent_class))->dispose)
-		(* ((GObjectClass *) (parent_class))->dispose) (object);
+	if ((G_OBJECT_CLASS(parent_class))->dispose)
+		(* (G_OBJECT_CLASS(parent_class))->dispose) (object);
 }
 
 static void
@@ -311,17 +309,16 @@ sp_color_slider_button_press (GtkWidget *widget, GdkEventButton *event)
 		g_signal_emit (G_OBJECT (slider), slider_signals[DRAGGED], 0);
 
 #if GTK_CHECK_VERSION(3,0,0)
-		gdk_device_grab(gdk_event_get_device((GdkEvent*)event),
+		gdk_device_grab(gdk_event_get_device(reinterpret_cast<GdkEvent *>(event)),
 				gtk_widget_get_window(widget), 
 				GDK_OWNERSHIP_NONE,
 				FALSE,
-				(GdkEventMask)(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK),
+				static_cast<GdkEventMask>(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK),
 				NULL,
 				event->time);
 #else		
 		gdk_pointer_grab(gtk_widget_get_window(widget), FALSE,
-				  (GdkEventMask)(GDK_POINTER_MOTION_MASK |
-				  GDK_BUTTON_RELEASE_MASK),
+				  static_cast<GdkEventMask>(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK),
 				  NULL, NULL, event->time);
 #endif
 	}
@@ -339,8 +336,8 @@ sp_color_slider_button_release (GtkWidget *widget, GdkEventButton *event)
 	if (event->button == 1) {
 
 #if GTK_CHECK_VERSION(3,0,0)
-		gdk_device_ungrab(gdk_event_get_device((GdkEvent *)event),
-                                  gdk_event_get_time((GdkEvent *)event));
+		gdk_device_ungrab(gdk_event_get_device(reinterpret_cast<GdkEvent *>(event)),
+                                  gdk_event_get_time(reinterpret_cast<GdkEvent *>(event)));
 #else
 		gdk_pointer_ungrab (event->time);
 #endif
@@ -388,7 +385,7 @@ void sp_color_slider_set_adjustment(SPColorSlider *slider, GtkAdjustment *adjust
     g_return_if_fail (SP_IS_COLOR_SLIDER (slider));
 
     if (!adjustment) {
-        adjustment = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 1.0, 0.01, 0.0, 0.0);
+        adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 1.0, 0.01, 0.0, 0.0));
     } else {
         gtk_adjustment_set_page_increment(adjustment, 0.0);
         gtk_adjustment_set_page_size(adjustment, 0.0);
@@ -448,7 +445,7 @@ sp_color_slider_set_map (SPColorSlider *slider, const guchar *map)
 	g_return_if_fail (slider != NULL);
 	g_return_if_fail (SP_IS_COLOR_SLIDER (slider));
 
-	slider->map = (guchar *) map;
+	slider->map = const_cast<guchar *>(map);
 
 	gtk_widget_queue_draw (GTK_WIDGET (slider));
 }
diff --git a/src/widgets/sp-color-wheel-selector.cpp b/src/widgets/sp-color-wheel-selector.cpp
index a979a168a..3e91274d2 100644
--- a/src/widgets/sp-color-wheel-selector.cpp
+++ b/src/widgets/sp-color-wheel-selector.cpp
@@ -56,12 +56,9 @@ sp_color_wheel_selector_get_type (void)
 static void sp_color_wheel_selector_class_init(SPColorWheelSelectorClass *klass)
 {
     static const gchar* nameset[] = {N_("Wheel"), 0};
-    GObjectClass *object_class = (GObjectClass *) klass;
-    GtkWidgetClass *widget_class;
-    SPColorSelectorClass *selector_class;
-
-    widget_class = (GtkWidgetClass *) klass;
-    selector_class = SP_COLOR_SELECTOR_CLASS (klass);
+    GObjectClass   *object_class = G_OBJECT_CLASS(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));
 
@@ -197,7 +194,7 @@ void ColorWheelSelector::init()
 #endif
 
     /* Adjustment */
-    _adj = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 255.0, 1.0, 10.0, 10.0);
+    _adj = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 255.0, 1.0, 10.0, 10.0));
 
     /* Slider */
     _slider = sp_color_slider_new (_adj);
@@ -266,8 +263,8 @@ void ColorWheelSelector::init()
 
 static void sp_color_wheel_selector_dispose(GObject *object)
 {
-    if (((GObjectClass *) (parent_class))->dispose)
-        (* ((GObjectClass *) (parent_class))->dispose) (object);
+    if ((G_OBJECT_CLASS(parent_class))->dispose)
+        (* (G_OBJECT_CLASS(parent_class))->dispose) (object);
 }
 
 static void
diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp
index 8d840da25..7876f0454 100644
--- a/src/widgets/sp-widget.cpp
+++ b/src/widgets/sp-widget.cpp
@@ -306,7 +306,7 @@ GtkWidget *SPWidgetImpl::constructGlobal(SPWidget *spw, Inkscape::Application *i
 
     g_signal_emit(spw, signals[CONSTRUCT], 0);
 
-    return (GtkWidget *) spw;
+    return GTK_WIDGET(spw);
 }
 
 void SPWidgetImpl::modifySelectionCB(Application *inkscape, Selection *selection, guint flags, SPWidget *spw)
diff --git a/src/widgets/sp-xmlview-attr-list.cpp b/src/widgets/sp-xmlview-attr-list.cpp
index 1fd120d17..47b0ebb9d 100644
--- a/src/widgets/sp-xmlview-attr-list.cpp
+++ b/src/widgets/sp-xmlview-attr-list.cpp
@@ -68,7 +68,7 @@ GtkWidget *sp_xmlview_attr_list_new (Inkscape::XML::Node * repr)
 
     sp_xmlview_attr_list_set_repr (attr_list, repr);
 
-    return (GtkWidget *) attr_list;
+    return GTK_WIDGET(attr_list);
 }
 
 void
@@ -114,14 +114,14 @@ GType sp_xmlview_attr_list_get_type(void)
 void sp_xmlview_attr_list_class_init (SPXMLViewAttrListClass * klass)
 {
 #if GTK_CHECK_VERSION(3,0,0)
-	GtkWidgetClass * widget_class = (GtkWidgetClass *) klass;
+	GtkWidgetClass * widget_class = GTK_WIDGET_CLASS(klass);
 	widget_class->destroy = sp_xmlview_attr_list_destroy;
 #else
-	GtkObjectClass * object_class = (GtkObjectClass *) klass;
+	GtkObjectClass * object_class = GTK_OBJECT_CLASS(klass);
 	object_class->destroy = sp_xmlview_attr_list_destroy;
 #endif
 
-	parent_class = (GtkTreeViewClass*)g_type_class_peek_parent (klass);
+	parent_class = GTK_TREE_VIEW_CLASS(g_type_class_peek_parent (klass));
 
         g_signal_new("row-value-changed",
                       G_TYPE_FROM_CLASS(klass),
diff --git a/src/widgets/sp-xmlview-content.cpp b/src/widgets/sp-xmlview-content.cpp
index d31e031c2..ac64dabdb 100644
--- a/src/widgets/sp-xmlview-content.cpp
+++ b/src/widgets/sp-xmlview-content.cpp
@@ -59,7 +59,7 @@ GtkWidget *sp_xmlview_content_new(Inkscape::XML::Node * repr)
 
     sp_xmlview_content_set_repr (text, repr);
 
-    return (GtkWidget *) text;
+    return GTK_WIDGET(text);
 }
 
 void
@@ -107,14 +107,14 @@ GType sp_xmlview_content_get_type(void)
 void sp_xmlview_content_class_init(SPXMLViewContentClass * klass)
 {
 #if GTK_CHECK_VERSION(3,0,0)
-    GtkWidgetClass * widget_class = (GtkWidgetClass *) klass;
+    GtkWidgetClass * widget_class = GTK_WIDGET_CLASS(klass);
     widget_class->destroy = sp_xmlview_content_destroy;
 #else
-    GtkObjectClass * object_class = (GtkObjectClass *) klass;
+    GtkObjectClass * object_class = GTK_OBJECT_CLASS(klass);
     object_class->destroy = sp_xmlview_content_destroy;
 #endif
 
-    parent_class = (GtkTextViewClass*)g_type_class_peek_parent (klass);
+    parent_class = GTK_TEXT_VIEW_CLASS(g_type_class_peek_parent (klass));
 }
 
 void
diff --git a/src/widgets/sp-xmlview-tree.cpp b/src/widgets/sp-xmlview-tree.cpp
index 258cea0b4..bc6031c1e 100644
--- a/src/widgets/sp-xmlview-tree.cpp
+++ b/src/widgets/sp-xmlview-tree.cpp
@@ -122,7 +122,7 @@ GtkWidget *sp_xmlview_tree_new(Inkscape::XML::Node * repr, void * /*factory*/, v
     g_signal_connect(GTK_TREE_VIEW(tree), "drag_data_received",  G_CALLBACK(on_drag_data_received), tree);
     g_signal_connect(GTK_TREE_VIEW(tree), "drag-motion",  G_CALLBACK(do_drag_motion), tree);
 
-    return (GtkWidget *) tree;
+    return GTK_WIDGET(tree);
 }
 
 GType
@@ -151,14 +151,14 @@ sp_xmlview_tree_get_type (void)
 void sp_xmlview_tree_class_init(SPXMLViewTreeClass * klass)
 {
 #if GTK_CHECK_VERSION(3,0,0)
-    GtkWidgetClass * widget_class = (GtkWidgetClass *) klass;
+    GtkWidgetClass * widget_class = GTK_WIDGET_CLASS(klass);
     widget_class->destroy = sp_xmlview_tree_destroy;
 #else
-    GtkObjectClass * object_class = (GtkObjectClass *) klass;
+    GtkObjectClass * object_class = GTK_OBJECT_CLASS(klass);
     object_class->destroy = sp_xmlview_tree_destroy;
 #endif
     
-    parent_class = (GtkTreeViewClass *) g_type_class_peek_parent (klass);
+    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",
@@ -441,7 +441,7 @@ void on_row_changed(GtkTreeModel *tree_model, GtkTreePath *path, GtkTreeIter *it
         return;
     }
 
-    GtkTreeRowReference  *old_parent_ref = (GtkTreeRowReference *)g_object_get_data (G_OBJECT (tree), "drag-src-path");
+    GtkTreeRowReference  *old_parent_ref = static_cast<GtkTreeRowReference *>(g_object_get_data (G_OBJECT (tree), "drag-src-path"));
     if (!old_parent_ref) {
         //No drag source location
         g_signal_emit_by_name(G_OBJECT (tree), "tree_move", GUINT_TO_POINTER(0) );
diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp
index 1d44b9190..96d746468 100644
--- a/src/widgets/spinbutton-events.cpp
+++ b/src/widgets/spinbutton-events.cpp
@@ -23,11 +23,9 @@
 #include "spinbutton-events.h"
 
 gboolean
-spinbutton_focus_in (GtkWidget *w, GdkEventKey */*event*/, gpointer /*data*/)
+spinbutton_focus_in (GtkWidget *w, GdkEventKey * /*event*/, gpointer /*data*/)
 {
-	gdouble *ini;
-
-	ini = (gdouble *) g_object_get_data(G_OBJECT (w), "ini");
+	gdouble *ini = static_cast<gdouble *>(g_object_get_data(G_OBJECT(w), "ini"));
 	if (ini) g_free (ini); // free the old value if any
 
 	// retrieve the value
@@ -43,7 +41,7 @@ spinbutton_focus_in (GtkWidget *w, GdkEventKey */*event*/, gpointer /*data*/)
 void
 spinbutton_undo (GtkWidget *w)
 {
-	gdouble *ini = (gdouble *) g_object_get_data(G_OBJECT (w), "ini");
+	gdouble *ini = static_cast<gdouble *>(g_object_get_data(G_OBJECT (w), "ini"));
 	if (ini) {
 	    gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), *ini);
 	}
@@ -57,7 +55,7 @@ spinbutton_defocus (GtkWidget *container)
 	if (stay) {
 		g_object_set_data (G_OBJECT (container), "stay", GINT_TO_POINTER (FALSE));
 	} else {
-		GtkWidget *canvas = (GtkWidget *) g_object_get_data(G_OBJECT (container), "dtw");
+		GtkWidget *canvas = GTK_WIDGET(g_object_get_data(G_OBJECT (container), "dtw"));
 		if (canvas) {
 			gtk_widget_grab_focus (GTK_WIDGET(canvas));
 		}
diff --git a/src/widgets/spiral-toolbar.cpp b/src/widgets/spiral-toolbar.cpp
index c51c8b6cf..b493ca5bf 100644
--- a/src/widgets/spiral-toolbar.cpp
+++ b/src/widgets/spiral-toolbar.cpp
@@ -147,15 +147,15 @@ static void sp_spl_tb_defaults(GtkWidget * /*widget*/, GObject *obj)
     gdouble exp = 1.0;
     gdouble t0 = 0.0;
 
-    adj = (GtkAdjustment*)g_object_get_data(obj, "revolution");
+    adj = GTK_ADJUSTMENT(g_object_get_data(obj, "revolution"));
     gtk_adjustment_set_value(adj, rev);
     gtk_adjustment_value_changed(adj);
 
-    adj = (GtkAdjustment*)g_object_get_data(obj, "expansion");
+    adj = GTK_ADJUSTMENT(g_object_get_data(obj, "expansion"));
     gtk_adjustment_set_value(adj, exp);
     gtk_adjustment_value_changed(adj);
 
-    adj = (GtkAdjustment*)g_object_get_data(obj, "t0");
+    adj = GTK_ADJUSTMENT(g_object_get_data(obj, "t0"));
     gtk_adjustment_set_value(adj, t0);
     gtk_adjustment_value_changed(adj);
 
@@ -181,17 +181,17 @@ static void spiral_tb_event_attr_changed(Inkscape::XML::Node *repr,
     g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE));
 
     GtkAdjustment *adj;
-    adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(tbl), "revolution");
+    adj = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(tbl), "revolution"));
     double revolution = 3.0;
     sp_repr_get_double(repr, "sodipodi:revolution", &revolution);
     gtk_adjustment_set_value(adj, revolution);
 
-    adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(tbl), "expansion");
+    adj = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(tbl), "expansion"));
     double expansion = 1.0;
     sp_repr_get_double(repr, "sodipodi:expansion", &expansion);
     gtk_adjustment_set_value(adj, expansion);
 
-    adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(tbl), "t0");
+    adj = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(tbl), "t0"));
     double t0 = 0.0;
     sp_repr_get_double(repr, "sodipodi:t0", &t0);
     gtk_adjustment_set_value(adj, t0);
diff --git a/src/widgets/star-toolbar.cpp b/src/widgets/star-toolbar.cpp
index d783e3336..f8c5714cb 100644
--- a/src/widgets/star-toolbar.cpp
+++ b/src/widgets/star-toolbar.cpp
@@ -337,7 +337,7 @@ static void star_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const *n
             gtk_action_set_sensitive( prop_action, FALSE );
         }
     } else if ((!strcmp(name, "sodipodi:r1") || !strcmp(name, "sodipodi:r2")) && (!isFlatSided) ) {
-        adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(tbl), "proportion");
+        adj = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(tbl), "proportion"));
         gdouble r1 = 1.0;
         gdouble r2 = 1.0;
         sp_repr_get_double(repr, "sodipodi:r1", &r1);
@@ -348,7 +348,7 @@ static void star_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const *n
             gtk_adjustment_set_value(adj, r1/r2);
         }
     } else if (!strcmp(name, "sodipodi:sides")) {
-        adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(tbl), "magnitude");
+        adj = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(tbl), "magnitude"));
         int sides = 0;
         sp_repr_get_int(repr, "sodipodi:sides", &sides);
         gtk_adjustment_set_value(adj, sides);
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp
index 9e0977d51..6c22c81e3 100644
--- a/src/widgets/text-toolbar.cpp
+++ b/src/widgets/text-toolbar.cpp
@@ -174,6 +174,9 @@ static void sp_text_fontstyle_populate(GObject *tbl, font_instance *font=NULL)
     Ink_ComboBoxEntry_Action* act = INK_COMBOBOXENTRY_ACTION( g_object_get_data( tbl, "TextFontFamilyAction" ) );
     GtkTreeModel *model = ink_comboboxentry_action_get_model( act );
     gchar *current_font = ink_comboboxentry_action_get_active_text( act );
+    if (!current_font) {
+        return;
+    }
 
     // Get an iter to the selected font from the model data
     // We cant get it from the combo, cause it might not have been created yet
@@ -183,11 +186,11 @@ static void sp_text_fontstyle_populate(GObject *tbl, font_instance *font=NULL)
     while ( valid ) {
 
       // Get text from list entry
-      gchar* text = 0;
+      gchar* text = NULL;
       gtk_tree_model_get( model, &iter, 0, &text, -1 ); // Column 0
 
       // Check for match
-      if( strcmp( current_font, text ) == 0 ){
+      if ( text && (strcmp( current_font, text ) == 0) ) {
         found = true;
         break;
       }
@@ -199,7 +202,7 @@ static void sp_text_fontstyle_populate(GObject *tbl, font_instance *font=NULL)
     }
 
     // Get the list of styles from the selected font
-    GList *list=0;
+    GList *list = NULL;
     gtk_tree_model_get (model, &iter, 1, &list, -1);
 
     Ink_ComboBoxEntry_Action* fontStyleAction = INK_COMBOBOXENTRY_ACTION( g_object_get_data( tbl, "TextFontStyleAction" ) );
diff --git a/src/widgets/widget-sizes.h b/src/widgets/widget-sizes.h
index fe89d4574..87c7ca2e0 100644
--- a/src/widgets/widget-sizes.h
+++ b/src/widgets/widget-sizes.h
@@ -35,11 +35,6 @@
 
 #define STATUS_LAYER_FONT_SIZE 7700
 
-#define RULER_WIDTH           12
-#define RULER_HEIGHT          12
-#define RULER_FONT_SIZE 6500
-#define RULER_FONT_VERTICAL_SPACING 1.2
-
 /*
   Local Variables:
   mode:c++