Finish removing GTK+ 2 fallbacks

(bzr r15023.2.8)

26 files changed, 29 insertions, 745 deletions

diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index 6ea8c1360..400cf2658 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -23,15 +23,8 @@
 #include <gdk/gdkkeysyms.h>
 
 static void sp_button_dispose(GObject *object);
-
-#if GTK_CHECK_VERSION(3, 0, 0)
 static void sp_button_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width);
-
 static void sp_button_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height);
-#else
-static void sp_button_size_request(GtkWidget *widget, GtkRequisition *requisition);
-#endif
-
 static void sp_button_clicked(GtkButton *button);
 static void sp_button_perform_action(SPButton *button, gpointer data);
 static gint sp_button_process_event(SPButton *button, GdkEvent *event);
@@ -50,12 +43,8 @@ static void sp_button_class_init(SPButtonClass *klass)
     GtkButtonClass *button_class = GTK_BUTTON_CLASS(klass);
 
     object_class->dispose = sp_button_dispose;
-#if GTK_CHECK_VERSION(3, 0, 0)
     widget_class->get_preferred_width = sp_button_get_preferred_width;
     widget_class->get_preferred_height = sp_button_get_preferred_height;
-#else
-    widget_class->size_request = sp_button_size_request;
-#endif
     button_class->clicked = sp_button_clicked;
 }
 
@@ -92,7 +81,6 @@ static void sp_button_dispose(GObject *object)
     (G_OBJECT_CLASS(sp_button_parent_class))->dispose(object);
 }
 
-#if GTK_CHECK_VERSION(3, 0, 0)
 static void sp_button_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width)
 {
     GtkWidget *child = gtk_bin_get_child(GTK_BIN(widget));
@@ -136,23 +124,6 @@ static void sp_button_get_preferred_height(GtkWidget *widget, gint *minimal_heig
     *minimal_height += MAX(2, padding.top + padding.bottom + border.top + border.bottom);
     *natural_height += MAX(2, padding.top + padding.bottom + border.top + border.bottom);
 }
-#else
-static void sp_button_size_request(GtkWidget *widget, GtkRequisition *requisition)
-{
-    GtkWidget *child = gtk_bin_get_child(GTK_BIN(widget));
-    GtkStyle *style = gtk_widget_get_style(widget);
-
-    if (child) {
-        gtk_widget_size_request(GTK_WIDGET(child), requisition);
-    } else {
-        requisition->width = 0;
-        requisition->height = 0;
-    }
-
-    requisition->width += 2 + 2 * MAX(2, style->xthickness);
-    requisition->height += 2 + 2 * MAX(2, style->ythickness);
-}
-#endif
 
 static void sp_button_clicked(GtkButton *button)
 {
diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp
index 9951a8957..5f1997672 100644
--- a/src/widgets/eek-preview.cpp
+++ b/src/widgets/eek-preview.cpp
@@ -194,7 +194,6 @@ static void eek_preview_size_request( GtkWidget* widget, GtkRequisition* req )
     req->height = height;
 }
 
-#if GTK_CHECK_VERSION(3,0,0)
 static void eek_preview_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width)
 {
 	GtkRequisition requisition;
@@ -208,7 +207,6 @@ static void eek_preview_get_preferred_height(GtkWidget *widget, gint *minimal_he
 	eek_preview_size_request(widget, &requisition);
 	*minimal_height = *natural_height = requisition.height;
 }
-#endif
 
 enum {
   CLICKED_SIGNAL,
@@ -219,22 +217,6 @@ enum {
 
 static guint eek_preview_signals[LAST_SIGNAL] = { 0 };
 
-#if !GTK_CHECK_VERSION(3,0,0)
-static gboolean eek_preview_expose_event( GtkWidget* widget, GdkEventExpose* /* event */ )
-{
-    gboolean result = FALSE;
-
-    if (gtk_widget_is_drawable(widget)) {
-	GdkWindow* window = gtk_widget_get_window(widget);
-	cairo_t* cr = gdk_cairo_create(window);
-	result = eek_preview_draw(widget, cr);
-	cairo_destroy(cr);
-    }
-
-    return result;
-}
-#endif
-
 static
 gboolean eek_preview_draw(GtkWidget *widget,
                           cairo_t   *cr)
@@ -246,14 +228,6 @@ gboolean eek_preview_draw(GtkWidget *widget,
     GtkAllocation allocation;
     gtk_widget_get_allocation(widget, &allocation);
    
-#if !GTK_CHECK_VERSION(3,0,0) 
-    GdkColor fg = { 0,
-                    static_cast<guint16>(priv->r),
-                    static_cast<guint16>(priv->g),
-                    static_cast<guint16>(priv->b)
-                  };
-#endif
-
     gint insetTop = 0, insetBottom = 0;
     gint insetLeft = 0, insetRight = 0;
 
@@ -270,9 +244,7 @@ gboolean eek_preview_draw(GtkWidget *widget,
         insetLeft = insetRight = 1;
     }
 
-
-#if GTK_CHECK_VERSION(3,0,0)
-    GtkStyleContext *context = gtk_widget_get_style_context(widget);
+    auto context = gtk_widget_get_style_context(widget);
 	
     gtk_render_frame(context,
                      cr,
@@ -283,22 +255,6 @@ gboolean eek_preview_draw(GtkWidget *widget,
                           cr,
                           0, 0,
                           allocation.width, allocation.height);
-#else
-    GtkStyle *style = gtk_widget_get_style(widget);
-    GdkWindow *window = gtk_widget_get_window(widget);
-        
-    gtk_paint_flat_box( style,
-                        window,
-                        (GtkStateType)gtk_widget_get_state(widget),
-                        GTK_SHADOW_NONE,
-                        NULL,
-                        widget,
-                        NULL,
-                        0, 0,
-                        allocation.width, allocation.height);
-        
-    gdk_colormap_alloc_color( gdk_colormap_get_system(), &fg, FALSE, TRUE );
-#endif
 
     // Border
     if (priv->border != BORDER_NONE) {
@@ -377,27 +333,12 @@ gboolean eek_preview_draw(GtkWidget *widget,
 
         if (priv->linked & PREVIEW_LINK_IN)
         {
-#if GTK_CHECK_VERSION(3,0,0)
             gtk_render_arrow(context,
                              cr,
                              G_PI, // Down-pointing arrow
                              area.x, area.y,
                              min(area.width, area.height)
                             );
-#else
-            gtk_paint_arrow( style,
-                             window,
-                             gtk_widget_get_state (widget),
-                             GTK_SHADOW_ETCHED_IN,
-                             NULL, /* clip area.  &area, */
-                             widget, /* may be NULL */
-                             NULL, /* detail */
-                             GTK_ARROW_DOWN,
-                             FALSE,
-                             area.x, area.y,
-                             area.width, area.height
-                           );
-#endif
         }
 
         if (priv->linked & PREVIEW_LINK_OUT)
@@ -407,27 +348,12 @@ gboolean eek_preview_draw(GtkWidget *widget,
                 otherArea.y = possible.y + (possible.height - otherArea.height);
             }
 
-#if GTK_CHECK_VERSION(3,0,0)
             gtk_render_arrow(context,
                              cr,
                              G_PI, // Down-pointing arrow
                              otherArea.x, otherArea.y,
                              min(otherArea.width, otherArea.height)
                             );
-#else
-            gtk_paint_arrow( style,
-                             window,
-                             gtk_widget_get_state (widget),
-                             GTK_SHADOW_ETCHED_OUT,
-                             NULL, /* clip area.  &area, */
-                             widget, /* may be NULL */
-                             NULL, /* detail */
-                             GTK_ARROW_DOWN,
-                             FALSE,
-                             otherArea.x, otherArea.y,
-                             otherArea.width, otherArea.height
-                           );
-#endif
         }
 
         if (priv->linked & PREVIEW_LINK_OTHER)
@@ -437,27 +363,12 @@ gboolean eek_preview_draw(GtkWidget *widget,
                 otherArea.y = possible.y + (possible.height - otherArea.height) / 2;
             }
 
-#if GTK_CHECK_VERSION(3,0,0)
             gtk_render_arrow(context,
                              cr,
                              1.5*G_PI, // Left-pointing arrow
                              otherArea.x, otherArea.y,
                              min(otherArea.width, otherArea.height)
                             );
-#else
-            gtk_paint_arrow( style,
-                             window,
-                             gtk_widget_get_state (widget),
-                             GTK_SHADOW_ETCHED_OUT,
-                             NULL, /* clip area.  &area, */
-                             widget, /* may be NULL */
-                             NULL, /* detail */
-                             GTK_ARROW_LEFT,
-                             FALSE,
-                             otherArea.x, otherArea.y,
-                             otherArea.width, otherArea.height
-                           );
-#endif
         }
 
 
@@ -469,22 +380,10 @@ gboolean eek_preview_draw(GtkWidget *widget,
             if ( otherArea.height < possible.height ) {
                 otherArea.y = possible.y + (possible.height - otherArea.height) / 2;
             }
-#if GTK_CHECK_VERSION(3,0,0)
             gtk_render_check(context,
                              cr,
                              otherArea.x, otherArea.y,
                              otherArea.width, otherArea.height );
-#else
-            gtk_paint_check( style,
-                             window,
-                             gtk_widget_get_state (widget),
-                             GTK_SHADOW_ETCHED_OUT,
-                             NULL,
-                             widget,
-                             NULL,
-                             otherArea.x, otherArea.y,
-                             otherArea.width, otherArea.height );
-#endif
         }
 
         if (priv->linked & PREVIEW_STROKE)
@@ -495,23 +394,11 @@ gboolean eek_preview_draw(GtkWidget *widget,
             if ( otherArea.height < possible.height ) {
                 otherArea.y = possible.y + (possible.height - otherArea.height) / 2;
             }
-#if GTK_CHECK_VERSION(3,0,0)
             // This should be a diamond too?
             gtk_render_check(context,
                              cr,
                              otherArea.x, otherArea.y,
                              otherArea.width, otherArea.height );
-#else
-            gtk_paint_diamond( style,
-                               window,
-                               gtk_widget_get_state (widget),
-                               GTK_SHADOW_ETCHED_OUT,
-                               NULL,
-                               widget,
-                               NULL,
-                               otherArea.x, otherArea.y,
-                               otherArea.width, otherArea.height );
-#endif
         }
     }
 
@@ -519,21 +406,10 @@ gboolean eek_preview_draw(GtkWidget *widget,
     if ( gtk_widget_has_focus(widget) ) {
         gtk_widget_get_allocation (widget, &allocation);
 
-#if GTK_CHECK_VERSION(3,0,0)
         gtk_render_focus(context,
                          cr,
                          0 + 1, 0 + 1,
                          allocation.width - 2, allocation.height - 2 );
-#else
-        gtk_paint_focus( style,
-                         window,
-                         GTK_STATE_NORMAL,
-                         NULL, /* GdkRectangle *area, */
-                         widget,
-                         NULL,
-                         0 + 1, 0 + 1,
-                         allocation.width - 2, allocation.height - 2 );
-#endif
     }
 
     return FALSE;
@@ -547,11 +423,7 @@ static gboolean eek_preview_enter_cb( GtkWidget* widget, GdkEventCrossing* event
         EekPreviewPrivate *priv    = EEK_PREVIEW_GET_PRIVATE(preview);
 
         priv->within = TRUE;
-#if GTK_CHECK_VERSION(3,0,0)
         gtk_widget_set_state_flags( widget, priv->hot ? GTK_STATE_FLAG_ACTIVE : GTK_STATE_FLAG_PRELIGHT, false );
-#else
-        gtk_widget_set_state( widget, priv->hot ? GTK_STATE_ACTIVE : GTK_STATE_PRELIGHT );
-#endif
     }
 
     return FALSE;
@@ -564,11 +436,7 @@ static gboolean eek_preview_leave_cb( GtkWidget* widget, GdkEventCrossing* event
         EekPreviewPrivate *priv    = EEK_PREVIEW_GET_PRIVATE(preview);
 
         priv->within = FALSE;
-#if GTK_CHECK_VERSION(3,0,0)
         gtk_widget_set_state_flags( widget, GTK_STATE_FLAG_NORMAL, false );
-#else
-        gtk_widget_set_state( widget, GTK_STATE_NORMAL );
-#endif
     }
 
     return FALSE;
@@ -593,11 +461,7 @@ static gboolean eek_preview_button_press_cb( GtkWidget* widget, GdkEventButton*
 
             if ( priv->within )
             {
-#if GTK_CHECK_VERSION(3,0,0)
                 gtk_widget_set_state_flags( widget, GTK_STATE_FLAG_ACTIVE, false );
-#else
-                gtk_widget_set_state( widget, GTK_STATE_ACTIVE );
-#endif
             }
         }
     }
@@ -612,11 +476,7 @@ static gboolean eek_preview_button_release_cb( GtkWidget* widget, GdkEventButton
         EekPreviewPrivate *priv    = EEK_PREVIEW_GET_PRIVATE(preview);
 
         priv->hot = FALSE;
-#if GTK_CHECK_VERSION(3,0,0)
         gtk_widget_set_state_flags( widget, GTK_STATE_FLAG_NORMAL, false );
-#else
-        gtk_widget_set_state( widget, GTK_STATE_NORMAL );
-#endif
 
         if ( priv->within &&
             (event->button == PRIME_BUTTON_MAGIC_NUMBER || 
@@ -697,15 +557,9 @@ static void eek_preview_class_init( EekPreviewClass *klass )
 
     parent_class = (GtkWidgetClass*)g_type_class_peek_parent( klass );
 
-#if GTK_CHECK_VERSION(3,0,0)
     widgetClass->get_preferred_width = eek_preview_get_preferred_width;
     widgetClass->get_preferred_height = eek_preview_get_preferred_height;
     widgetClass->draw = eek_preview_draw;
-#else
-    widgetClass->size_request = eek_preview_size_request;
-    widgetClass->expose_event = eek_preview_expose_event;
-#endif
-
     widgetClass->button_press_event = eek_preview_button_press_cb;
     widgetClass->button_release_event = eek_preview_button_release_cb;
     widgetClass->enter_notify_event = eek_preview_enter_cb;
diff --git a/src/widgets/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp
index 272217aa4..8fef21741 100644
--- a/src/widgets/ege-adjustment-action.cpp
+++ b/src/widgets/ege-adjustment-action.cpp
@@ -813,12 +813,8 @@ static GtkWidget* create_tool_item( GtkAction* action )
     if ( IS_EGE_ADJUSTMENT_ACTION(action) ) {
         EgeAdjustmentAction* act = EGE_ADJUSTMENT_ACTION( action );
         GtkWidget* spinbutton = 0;
-#if GTK_CHECK_VERSION(3,0,0)
-	GtkWidget* hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
+	auto hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
 	gtk_box_set_homogeneous(GTK_BOX(hb), FALSE);
-#else
-        GtkWidget* hb = gtk_hbox_new( FALSE, 5 );
-#endif
         GValue value;
         memset( &value, 0, sizeof(value) );
         g_value_init( &value, G_TYPE_STRING );
@@ -865,13 +861,7 @@ static GtkWidget* create_tool_item( GtkAction* action )
                 gtk_box_pack_start( GTK_BOX(hb), icon, FALSE, FALSE, 0 );
             } else {
                 GtkWidget* lbl = gtk_label_new( g_value_get_string( &value ) ? g_value_get_string( &value ) : "wwww" );
-
-#if GTK_CHECK_VERSION(3,0,0)
                 gtk_widget_set_halign(lbl, GTK_ALIGN_END);
-#else
-                gtk_misc_set_alignment( GTK_MISC(lbl), 1.0, 0.5 );
-#endif
-
                 gtk_box_pack_start( GTK_BOX(hb), lbl, FALSE, FALSE, 0 );
             }
         }
diff --git a/src/widgets/ege-output-action.cpp b/src/widgets/ege-output-action.cpp
index 5dece8e91..da29524a5 100644
--- a/src/widgets/ege-output-action.cpp
+++ b/src/widgets/ege-output-action.cpp
@@ -166,12 +166,8 @@ GtkWidget* create_tool_item( GtkAction* action )
     if ( IS_EGE_OUTPUT_ACTION(action) )
     {
         GValue value;
-#if GTK_CHECK_VERSION(3,0,0)
-        GtkWidget* hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
+        auto hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
 	gtk_box_set_homogeneous(GTK_BOX(hb), FALSE);
-#else
-        GtkWidget* hb = gtk_hbox_new( FALSE, 5 );
-#endif
         GtkWidget* lbl = 0;
         memset( &value, 0, sizeof(value) );
 
diff --git a/src/widgets/ege-select-one-action.cpp b/src/widgets/ege-select-one-action.cpp
index 2e106154e..5555663e4 100644
--- a/src/widgets/ege-select-one-action.cpp
+++ b/src/widgets/ege-select-one-action.cpp
@@ -632,12 +632,8 @@ GtkWidget* create_tool_item( GtkAction* action )
         item = GTK_WIDGET( gtk_tool_item_new() );
 
         if ( act->private_data->appearanceMode == APPEARANCE_FULL ) {
-#if GTK_CHECK_VERSION(3,0,0)
-            GtkWidget* holder = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+            auto holder = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
             gtk_box_set_homogeneous(GTK_BOX(holder), FALSE);
-#else
-            GtkWidget* holder = gtk_hbox_new( FALSE, 0 );
-#endif
 
             GtkRadioAction* ract = 0;
             GSList* group = 0;
@@ -744,12 +740,8 @@ GtkWidget* create_tool_item( GtkAction* action )
 
             gtk_container_add( GTK_CONTAINER(item), holder );
         } else {
-#if GTK_CHECK_VERSION(3,0,0)
-            GtkWidget* holder = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
+            auto holder = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
             gtk_box_set_homogeneous(GTK_BOX(holder), FALSE);
-#else
-            GtkWidget *holder = gtk_hbox_new( FALSE, 4 );
-#endif
 
             GtkEntry *entry = 0;
             GtkWidget *normal;
@@ -818,14 +810,8 @@ GtkWidget* create_tool_item( GtkAction* action )
             gtk_box_pack_start( GTK_BOX(holder), normal, FALSE, FALSE, 0 );
 
             {
-#if GTK_CHECK_VERSION(3,0,0)
                 gtk_widget_set_halign(holder, GTK_ALIGN_START);
                 gtk_container_add(GTK_CONTAINER(item), holder);
-#else
-                GtkWidget *align = gtk_alignment_new(0, 0.5, 0, 0);
-                gtk_container_add( GTK_CONTAINER(align), holder);
-                gtk_container_add( GTK_CONTAINER(item), align );
-#endif
             }
         }
 
@@ -861,13 +847,6 @@ void resync_active( EgeSelectOneAction* act, gint active, gboolean override )
                 if ( children && children->data ) {
                     gpointer combodata = g_object_get_data( G_OBJECT(children->data), "ege-combo-box" );
 
-#if !GTK_CHECK_VERSION(3,0,0)
-                    if (!combodata && GTK_IS_ALIGNMENT(children->data)) {
-                        GList *other = gtk_container_get_children( GTK_CONTAINER(children->data) );
-                         combodata = g_object_get_data( G_OBJECT(other->data), "ege-combo-box" );
-                    }
-#endif
-
                     if ( GTK_IS_COMBO_BOX(combodata) ) {
                         GtkComboBox* combo = GTK_COMBO_BOX(combodata);
                         if ((active == -1) && (gtk_combo_box_get_has_entry(combo))) {
@@ -925,13 +904,6 @@ void resync_sensitive( EgeSelectOneAction* act )
             if ( children && children->data ) {
                 gpointer combodata = g_object_get_data( G_OBJECT(children->data), "ege-combo-box" );
 
-#if !GTK_CHECK_VERSION(3,0,0)
-                if (!combodata && GTK_IS_ALIGNMENT(children->data)) {
-                    GList *other = gtk_container_get_children( GTK_CONTAINER(children->data) );
-                    combodata = g_object_get_data( G_OBJECT(other->data), "ege-combo-box" );
-                }
-#endif
-
                 if ( GTK_IS_COMBO_BOX(combodata) ) {
                     /* Not implemented */
                 } else if ( GTK_IS_BOX(children->data) ) {
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index aefcb2e81..54b693ce0 100644
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -36,11 +36,7 @@
 
 struct SPFontSelector
 {
-#if GTK_CHECK_VERSION(3,0,0)
     GtkBox hbox;
-#else
-    GtkHBox hbox;
-#endif
 
     unsigned int block_emit : 1;
 
@@ -61,11 +57,7 @@ struct SPFontSelector
 
 struct SPFontSelectorClass
 {
-#if GTK_CHECK_VERSION(3,0,0)
     GtkBoxClass parent_class;
-#else
-    GtkHBoxClass parent_class;
-#endif
 
     void (* font_set) (SPFontSelector *fsel, gchar *fontspec);
 };
@@ -91,11 +83,7 @@ static void sp_font_selector_set_sizes( SPFontSelector *fsel );
 
 static guint fs_signals[LAST_SIGNAL] = { 0 };
 
-#if GTK_CHECK_VERSION(3,0,0)
 G_DEFINE_TYPE(SPFontSelector, sp_font_selector, GTK_TYPE_BOX);
-#else
-G_DEFINE_TYPE(SPFontSelector, sp_font_selector, GTK_TYPE_HBOX);
-#endif
 
 static void sp_font_selector_class_init(SPFontSelectorClass *c)
 {
@@ -160,8 +148,7 @@ static void sp_font_selector_init(SPFontSelector *fsel)
         /* Muck with style, see text-toolbar.cpp */
         gtk_widget_set_name( GTK_WIDGET(fsel->family_treeview), "font_selector_family" );
 
-#if GTK_CHECK_VERSION(3,0,0)
-        GtkCssProvider *css_provider = gtk_css_provider_new();
+        auto css_provider = gtk_css_provider_new();
         gtk_css_provider_load_from_data(css_provider,
                                         "#font_selector_family {\n"
                                         "  -GtkWidget-wide-separators:  true;\n"
@@ -169,14 +156,10 @@ static void sp_font_selector_init(SPFontSelector *fsel)
                                         "}\n",
                                         -1, NULL);
 
-        GdkScreen *screen = gdk_screen_get_default();
+        auto screen = gdk_screen_get_default();
         gtk_style_context_add_provider_for_screen(screen,
                                                   GTK_STYLE_PROVIDER(css_provider),
                                                   GTK_STYLE_PROVIDER_PRIORITY_USER);
-#else
-        gtk_rc_parse_string (
-            "widget \"*font_selector_family\" style \"fontfamily-separator-style\"");
-#endif        
 
         Inkscape::FontLister* fontlister = Inkscape::FontLister::get_instance();
         Glib::RefPtr<Gtk::ListStore> store = fontlister->get_font_list();
@@ -195,12 +178,8 @@ static void sp_font_selector_init(SPFontSelector *fsel)
         gtk_widget_show(f);
         gtk_box_pack_start(GTK_BOX (fsel), f, TRUE, TRUE, 0);
 
-#if GTK_CHECK_VERSION(3,0,0)
-        GtkWidget *vb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
+        auto vb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
         gtk_box_set_homogeneous(GTK_BOX(vb), FALSE);
-#else
-        GtkWidget *vb = gtk_vbox_new(FALSE, 4);
-#endif
         gtk_widget_show(vb);
         gtk_container_set_border_width(GTK_CONTAINER (vb), 4);
         gtk_container_add(GTK_CONTAINER(f), vb);
@@ -235,12 +214,8 @@ static void sp_font_selector_init(SPFontSelector *fsel)
         selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(fsel->style_treeview));
         g_signal_connect (G_OBJECT(selection), "changed", G_CALLBACK (sp_font_selector_style_select_row), fsel);
 
-#if GTK_CHECK_VERSION(3,0,0)
-	GtkWidget *hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
+	auto hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
 	gtk_box_set_homogeneous(GTK_BOX(hb), FALSE);
-#else
-        GtkWidget *hb = gtk_hbox_new(FALSE, 4);
-#endif
         gtk_widget_show(hb);
         gtk_box_pack_start(GTK_BOX(vb), hb, FALSE, FALSE, 0);
 
diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp
index 6901b8549..dff564feb 100644
--- a/src/widgets/gradient-image.cpp
+++ b/src/widgets/gradient-image.cpp
@@ -21,7 +21,6 @@
 
 static void sp_gradient_image_size_request (GtkWidget *widget, GtkRequisition *requisition);
 
-#if GTK_CHECK_VERSION(3,0,0)
 static void sp_gradient_image_destroy(GtkWidget *object);
 static void sp_gradient_image_get_preferred_width(GtkWidget *widget, 
                                                    gint *minimal_width,
@@ -30,11 +29,6 @@ static void sp_gradient_image_get_preferred_width(GtkWidget *widget,
 static void sp_gradient_image_get_preferred_height(GtkWidget *widget, 
                                                     gint *minimal_height,
                                                     gint *natural_height);
-#else
-static void sp_gradient_image_destroy(GtkObject *object);
-static gboolean sp_gradient_image_expose(GtkWidget *widget, GdkEventExpose *event);
-#endif
-
 static gboolean sp_gradient_image_draw(GtkWidget *widget, cairo_t *cr);
 static void sp_gradient_image_gradient_release (SPObject *, SPGradientImage *im);
 static void sp_gradient_image_gradient_modified (SPObject *, guint flags, SPGradientImage *im);
@@ -46,18 +40,10 @@ static void sp_gradient_image_class_init(SPGradientImageClass *klass)
 {
         GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
 
-#if GTK_CHECK_VERSION(3,0,0)
         widget_class->get_preferred_width = sp_gradient_image_get_preferred_width;
         widget_class->get_preferred_height = sp_gradient_image_get_preferred_height;
         widget_class->draw = sp_gradient_image_draw;
         widget_class->destroy = sp_gradient_image_destroy;
-#else
-        GtkObjectClass *object_class = GTK_OBJECT_CLASS(klass);
-
-        object_class->destroy = sp_gradient_image_destroy;
-        widget_class->size_request = sp_gradient_image_size_request;
-        widget_class->expose_event = sp_gradient_image_expose;
-#endif
 }
 
 static void
@@ -71,11 +57,7 @@ sp_gradient_image_init (SPGradientImage *image)
         new (&image->modified_connection) sigc::connection();
 }
 
-#if GTK_CHECK_VERSION(3,0,0)
 static void sp_gradient_image_destroy(GtkWidget *object)
-#else
-static void sp_gradient_image_destroy(GtkObject *object)
-#endif
 {
         SPGradientImage *image = SP_GRADIENT_IMAGE (object);
 
@@ -88,13 +70,8 @@ static void sp_gradient_image_destroy(GtkObject *object)
         image->release_connection.~connection();
         image->modified_connection.~connection();
 
-#if GTK_CHECK_VERSION(3,0,0)
         if (GTK_WIDGET_CLASS(sp_gradient_image_parent_class)->destroy)
             GTK_WIDGET_CLASS(sp_gradient_image_parent_class)->destroy(object);
-#else
-        if (GTK_OBJECT_CLASS(sp_gradient_image_parent_class)->destroy)
-            GTK_OBJECT_CLASS(sp_gradient_image_parent_class)->destroy(object);
-#endif
 }
 
 static void sp_gradient_image_size_request(GtkWidget * /*widget*/, GtkRequisition *requisition)
@@ -103,7 +80,6 @@ static void sp_gradient_image_size_request(GtkWidget * /*widget*/, GtkRequisitio
     requisition->height = 12;
 }
 
-#if GTK_CHECK_VERSION(3,0,0)
 static void sp_gradient_image_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width)
 {
         GtkRequisition requisition;
@@ -117,27 +93,6 @@ static void sp_gradient_image_get_preferred_height(GtkWidget *widget, gint *mini
         sp_gradient_image_size_request(widget, &requisition);
         *minimal_height = *natural_height = requisition.height;
 }
-#endif
-
-#if !GTK_CHECK_VERSION(3,0,0)
-static gboolean sp_gradient_image_expose(GtkWidget *widget, GdkEventExpose *event)
-{
-        gboolean result = TRUE;
-        if(gtk_widget_is_drawable(widget)) {
-                cairo_t *ct = gdk_cairo_create(gtk_widget_get_window (widget));
-                cairo_rectangle(ct, event->area.x, event->area.y,
-                                event->area.width, event->area.height);
-                cairo_clip(ct);
-                GtkAllocation allocation;
-                gtk_widget_get_allocation(widget, &allocation);
-                cairo_translate(ct, allocation.x, allocation.y);
-                result = sp_gradient_image_draw(widget, ct);
-                cairo_destroy(ct);
-        }
-
-        return result;
-}
-#endif
 
 static gboolean sp_gradient_image_draw(GtkWidget *widget, cairo_t *ct)
 {
diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp
index 604ecd108..7d88499ab 100644
--- a/src/widgets/gradient-selector.cpp
+++ b/src/widgets/gradient-selector.cpp
@@ -60,11 +60,7 @@ static void sp_gradient_selector_delete_vector_clicked (GtkWidget *w, SPGradient
 
 static guint signals[LAST_SIGNAL] = {0};
 
-#if GTK_CHECK_VERSION(3,0,0)
 G_DEFINE_TYPE(SPGradientSelector, sp_gradient_selector, GTK_TYPE_BOX);
-#else
-G_DEFINE_TYPE(SPGradientSelector, sp_gradient_selector, GTK_TYPE_VBOX);
-#endif
 
 static void sp_gradient_selector_class_init(SPGradientSelectorClass *klass)
 {
@@ -116,9 +112,7 @@ static void sp_gradient_selector_init(SPGradientSelector *sel)
     sel->safelyInit = true;
     sel->blocked = false;
 
-#if GTK_CHECK_VERSION(3,0,0)
     gtk_orientable_set_orientation(GTK_ORIENTABLE(sel), GTK_ORIENTATION_VERTICAL);
-#endif
 
     new (&sel->nonsolid) std::vector<GtkWidget*>();
     new (&sel->swatch_widgets) std::vector<GtkWidget*>();
@@ -180,13 +174,8 @@ static void sp_gradient_selector_init(SPGradientSelector *sel)
 
 
     /* Create box for buttons */
-#if GTK_CHECK_VERSION(3,0,0)
-    GtkWidget *hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+    auto hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_box_set_homogeneous(GTK_BOX(hb), FALSE);
-#else
-    GtkWidget *hb = gtk_hbox_new( FALSE, 2 );
-#endif
-    //sel->nonsolid.push_back(hb);
     gtk_box_pack_start( GTK_BOX(sel), hb, FALSE, FALSE, 0 );
 
     sel->add = gtk_button_new();
diff --git a/src/widgets/gradient-selector.h b/src/widgets/gradient-selector.h
index e090d7cbd..6b5d4ca60 100644
--- a/src/widgets/gradient-selector.h
+++ b/src/widgets/gradient-selector.h
@@ -45,11 +45,7 @@ class TreeView;
 
 
 struct SPGradientSelector {
-#if GTK_CHECK_VERSION(3,0,0)
     GtkBox  vbox;
-#else
-    GtkVBox vbox;
-#endif
 
     enum SelectorMode {
         MODE_LINEAR,
@@ -131,11 +127,7 @@ struct SPGradientSelector {
 };
 
 struct SPGradientSelectorClass {
-#if GTK_CHECK_VERSION(3,0,0)
     GtkBoxClass parent_class;
-#else
-    GtkVBoxClass parent_class;
-#endif
 
     void (* grabbed) (SPGradientSelector *sel);
     void (* dragged) (SPGradientSelector *sel);
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 97e65141f..ce571bb6f 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -66,11 +66,7 @@ enum {
     LAST_SIGNAL
 };
 
-#if GTK_CHECK_VERSION(3,0,0)
 static void sp_gradient_vector_selector_destroy(GtkWidget *object);
-#else
-static void sp_gradient_vector_selector_destroy(GtkObject *object);
-#endif
 
 static void sp_gvs_gradient_release(SPObject *obj, SPGradientVectorSelector *gvs);
 static void sp_gvs_defs_release(SPObject *defs, SPGradientVectorSelector *gvs);
@@ -89,11 +85,7 @@ static win_data wd;
 static gint x = -1000, y = -1000, w = 0, h = 0; // impossible original values to make sure they are read from prefs
 static Glib::ustring const prefs_path = "/dialogs/gradienteditor/";
 
-#if GTK_CHECK_VERSION(3,0,0)
 G_DEFINE_TYPE(SPGradientVectorSelector, sp_gradient_vector_selector, GTK_TYPE_BOX);
-#else
-G_DEFINE_TYPE(SPGradientVectorSelector, sp_gradient_vector_selector, GTK_TYPE_VBOX);
-#endif
 
 static void sp_gradient_vector_selector_class_init(SPGradientVectorSelectorClass *klass)
 {
@@ -108,20 +100,13 @@ static void sp_gradient_vector_selector_class_init(SPGradientVectorSelectorClass
                                         G_TYPE_NONE, 1,
                                         G_TYPE_POINTER);
 
-#if GTK_CHECK_VERSION(3,0,0)
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
     widget_class->destroy = sp_gradient_vector_selector_destroy;
-#else
-    GtkObjectClass *object_class = GTK_OBJECT_CLASS(klass);
-    object_class->destroy = sp_gradient_vector_selector_destroy;
-#endif
 }
 
 static void sp_gradient_vector_selector_init(SPGradientVectorSelector *gvs)
 {
-#if GTK_CHECK_VERSION(3,0,0)
     gtk_orientable_set_orientation(GTK_ORIENTABLE(gvs), GTK_ORIENTATION_VERTICAL);
-#endif
 
     gvs->idlabel = TRUE;
 
@@ -140,11 +125,7 @@ static void sp_gradient_vector_selector_init(SPGradientVectorSelector *gvs)
 
 }
 
-#if GTK_CHECK_VERSION(3,0,0)
 static void sp_gradient_vector_selector_destroy(GtkWidget *object)
-#else
-static void sp_gradient_vector_selector_destroy(GtkObject *object)
-#endif
 {
     SPGradientVectorSelector *gvs = SP_GRADIENT_VECTOR_SELECTOR(object);
 
@@ -165,15 +146,9 @@ static void sp_gradient_vector_selector_destroy(GtkObject *object)
     gvs->defs_modified_connection.~connection();
     gvs->tree_select_connection.~connection();
 
-#if GTK_CHECK_VERSION(3,0,0)
     if ((GTK_WIDGET_CLASS(sp_gradient_vector_selector_parent_class))->destroy) {
         (GTK_WIDGET_CLASS(sp_gradient_vector_selector_parent_class))->destroy(object);
     }
-#else
-    if ((GTK_OBJECT_CLASS(sp_gradient_vector_selector_parent_class))->destroy) {
-        (GTK_OBJECT_CLASS(sp_gradient_vector_selector_parent_class))->destroy(object);
-    }
-#endif
 }
 
 GtkWidget *sp_gradient_vector_selector_new(SPDocument *doc, SPGradient *gr)
@@ -484,15 +459,8 @@ static GtkWidget *sp_gradient_vector_widget_new(SPGradient *gradient, SPStop *st
 
 static void sp_gradient_vector_widget_load_gradient(GtkWidget *widget, SPGradient *gradient);
 static gint sp_gradient_vector_dialog_delete(GtkWidget *widget, GdkEvent *event, GtkWidget *dialog);
-
-#if GTK_CHECK_VERSION(3,0,0)
 static void sp_gradient_vector_dialog_destroy(GtkWidget *object, gpointer data);
 static void sp_gradient_vector_widget_destroy(GtkWidget *object, gpointer data);
-#else
-static void sp_gradient_vector_dialog_destroy(GtkObject *object, gpointer data);
-static void sp_gradient_vector_widget_destroy(GtkObject *object, gpointer data);
-#endif
-
 static void sp_gradient_vector_gradient_release(SPObject *obj, GtkWidget *widget);
 static void sp_gradient_vector_gradient_modified(SPObject *obj, guint flags, GtkWidget *widget);
 static void sp_gradient_vector_color_dragged(Inkscape::UI::SelectedColor *selected_color, GObject *object);
@@ -845,12 +813,8 @@ static GtkWidget * sp_gradient_vector_widget_new(SPGradient *gradient, SPStop *s
     g_return_val_if_fail(gradient != NULL, NULL);
     g_return_val_if_fail(SP_IS_GRADIENT(gradient), NULL);
 
-#if GTK_CHECK_VERSION(3,0,0)
     vb = gtk_box_new(GTK_ORIENTATION_VERTICAL, PAD);
     gtk_box_set_homogeneous(GTK_BOX(vb), FALSE);
-#else
-    vb = gtk_vbox_new(FALSE, PAD);
-#endif
     g_signal_connect(G_OBJECT(vb), "destroy", G_CALLBACK(sp_gradient_vector_widget_destroy), NULL);
 
     w = sp_gradient_image_new(gradient);
@@ -883,12 +847,8 @@ static GtkWidget * sp_gradient_vector_widget_new(SPGradient *gradient, SPStop *s
     g_signal_connect(G_OBJECT(combo_box), "changed", G_CALLBACK(sp_grad_edit_combo_box_changed), vb);
 
     /* Add and Remove buttons */
-#if GTK_CHECK_VERSION(3,0,0)
-    GtkWidget *hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
+    auto hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
     gtk_box_set_homogeneous(GTK_BOX(hb), FALSE);
-#else
-    GtkWidget *hb = gtk_hbox_new(FALSE, 1);
-#endif
     // TRANSLATORS: "Stop" means: a "phase" of a gradient
     GtkWidget *b = gtk_button_new_with_label(_("Add stop"));
     gtk_widget_show(b);
@@ -905,21 +865,12 @@ static GtkWidget * sp_gradient_vector_widget_new(SPGradient *gradient, SPStop *s
     gtk_box_pack_start(GTK_BOX(vb),hb, FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS);
 
     /*  Offset Slider and stuff   */
-#if GTK_CHECK_VERSION(3,0,0)
     hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_box_set_homogeneous(GTK_BOX(hb), FALSE);
-#else
-    hb = gtk_hbox_new(FALSE, 0);
-#endif
 
     /* Label */
     GtkWidget *l = gtk_label_new(C_("Gradient","Offset:"));
-
-#if GTK_CHECK_VERSION(3,0,0)
     gtk_widget_set_halign(l, GTK_ALIGN_END);
-#else
-    gtk_misc_set_alignment(GTK_MISC(l), 1.0, 0.5);
-#endif
 
     gtk_box_pack_start(GTK_BOX(hb),l, FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS);
     gtk_widget_show(l);
@@ -937,11 +888,7 @@ static GtkWidget * sp_gradient_vector_widget_new(SPGradient *gradient, SPStop *s
     gtk_adjustment_set_value(Offset_adj, stop->offset);
 
     /* Slider */
-#if GTK_CHECK_VERSION(3,0,0)
-    GtkWidget *slider = gtk_scale_new(GTK_ORIENTATION_HORIZONTAL, Offset_adj);
-#else
-    GtkWidget *slider = gtk_hscale_new(Offset_adj);
-#endif
+    auto slider = gtk_scale_new(GTK_ORIENTATION_HORIZONTAL, Offset_adj);
     gtk_scale_set_draw_value( GTK_SCALE(slider), FALSE );
     gtk_widget_show(slider);
     gtk_box_pack_start(GTK_BOX(hb),slider, TRUE, TRUE, AUX_BETWEEN_BUTTON_GROUPS);
@@ -1179,11 +1126,7 @@ static void sp_gradient_vector_widget_load_gradient(GtkWidget *widget, SPGradien
     blocked = FALSE;
 }
 
-#if GTK_CHECK_VERSION(3,0,0)
 static void sp_gradient_vector_dialog_destroy(GtkWidget * /*object*/, gpointer /*data*/)
-#else
-static void sp_gradient_vector_dialog_destroy(GtkObject * /*object*/, gpointer /*data*/)
-#endif
 {
     GObject *obj = G_OBJECT(dlg);
     assert(obj != NULL);
@@ -1234,11 +1177,7 @@ static gboolean sp_gradient_vector_dialog_delete(GtkWidget */*widget*/, GdkEvent
 }
 
 /* Widget destroy handler */
-#if GTK_CHECK_VERSION(3,0,0)
 static void sp_gradient_vector_widget_destroy(GtkWidget *object, gpointer /*data*/)
-#else
-static void sp_gradient_vector_widget_destroy(GtkObject *object, gpointer /*data*/)
-#endif
 {
     SPObject *gradient = SP_OBJECT(g_object_get_data(G_OBJECT(object), "gradient"));
 
diff --git a/src/widgets/gradient-vector.h b/src/widgets/gradient-vector.h
index 5ae90b28f..b51b276b9 100644
--- a/src/widgets/gradient-vector.h
+++ b/src/widgets/gradient-vector.h
@@ -35,11 +35,7 @@ class SPGradient;
 class SPStop;
 
 struct SPGradientVectorSelector {
-#if GTK_CHECK_VERSION(3,0,0)
     GtkBox vbox;
-#else
-    GtkVBox vbox;
-#endif
 
     guint idlabel : 1;
 
@@ -61,11 +57,7 @@ struct SPGradientVectorSelector {
 };
 
 struct SPGradientVectorSelectorClass {
-#if GTK_CHECK_VERSION(3,0,0)
     GtkBoxClass parent_class;
-#else
-    GtkVBoxClass parent_class;
-#endif
 
     void (* vector_set) (SPGradientVectorSelector *gvs, SPGradient *gr);
 };
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index f2031fe51..38b4f2897 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -64,10 +64,6 @@ struct IconImpl {
     static void sizeAllocate(GtkWidget *widget, GtkAllocation *allocation);
     static gboolean draw(GtkWidget *widget, cairo_t *cr);
 
-#if !GTK_CHECK_VERSION(3,0,0)
-    static gboolean expose(GtkWidget *widget, GdkEventExpose *event);
-#endif
-
     static void screenChanged( GtkWidget *widget, GdkScreen *previous_screen );
     static void styleSet( GtkWidget *widget, GtkStyle *previous_style );
     static void themeChanged( SPIcon *icon );
@@ -149,14 +145,9 @@ sp_icon_class_init(SPIconClass *klass)
 
     object_class->dispose = IconImpl::dispose;
 
-#if GTK_CHECK_VERSION(3,0,0)
     widget_class->get_preferred_width = IconImpl::getPreferredWidth;
     widget_class->get_preferred_height = IconImpl::getPreferredHeight;
     widget_class->draw = IconImpl::draw;
-#else
-    widget_class->size_request = IconImpl::sizeRequest;
-    widget_class->expose_event = IconImpl::expose;
-#endif
     widget_class->size_allocate = IconImpl::sizeAllocate;
     widget_class->screen_changed = IconImpl::screenChanged;
     widget_class->style_set = IconImpl::styleSet;
@@ -244,37 +235,15 @@ gboolean IconImpl::draw(GtkWidget *widget, cairo_t* cr)
     bool unref_image = false;
 
     /* copied from the expose function of GtkImage */
-#if GTK_CHECK_VERSION(3,0,0)
     if (gtk_widget_get_state_flags (GTK_WIDGET(icon)) != GTK_STATE_FLAG_NORMAL && image) {
-#else
-    if (gtk_widget_get_state (GTK_WIDGET(icon)) != GTK_STATE_NORMAL && image) {
-        std::cerr << "IconImpl::draw: Ooops! It is called in GTK2" << std::endl;
-#endif
         std::cerr << "IconImpl::draw: No image, creating fallback" << std::endl;
 
-#if GTK_CHECK_VERSION(3,0,0)
-        // image = gtk_render_icon_pixbuf(gtk_widget_get_style_context(widget), 
-        //                                source, 
-        //                                (GtkIconSize)-1);
-
-        // gtk_render_icon_pixbuf deprecated, replaced by:
         GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
         image = gtk_icon_theme_load_icon (icon_theme,
                                           "gtk-image",
                                           32,
                                           (GtkIconLookupFlags)0,
                                           NULL);
-#else
-        GtkIconSource *source = gtk_icon_source_new();
-        gtk_icon_source_set_pixbuf(source, icon->pb);
-        gtk_icon_source_set_size(source, GTK_ICON_SIZE_SMALL_TOOLBAR); // note: this is boilerplate and not used
-        gtk_icon_source_set_size_wildcarded(source, FALSE);
-        image = gtk_style_render_icon(gtk_widget_get_style(widget), source, 
-			gtk_widget_get_direction(widget),
-			(GtkStateType) gtk_widget_get_state(widget), 
-			(GtkIconSize)-1, widget, "gtk-image");
-        gtk_icon_source_free(source);
-#endif
 
         unref_image = true;
     }
@@ -283,12 +252,7 @@ gboolean IconImpl::draw(GtkWidget *widget, cairo_t* cr)
         GtkAllocation allocation;
 	GtkRequisition requisition;
 	gtk_widget_get_allocation(widget, &allocation);
-
-#if GTK_CHECK_VERSION(3,0,0)
         gtk_widget_get_preferred_size(widget, &requisition, NULL);
-#else
-	gtk_widget_get_requisition(widget, &requisition);
-#endif
 
         int x = floor(allocation.x + ((allocation.width - requisition.width) * 0.5));
         int y = floor(allocation.y + ((allocation.height - requisition.height) * 0.5));
@@ -308,21 +272,6 @@ gboolean IconImpl::draw(GtkWidget *widget, cairo_t* cr)
     return TRUE;
 }
 
-#if !GTK_CHECK_VERSION(3,0,0)
-gboolean IconImpl::expose(GtkWidget *widget, GdkEventExpose * /*event*/)
-{
-    gboolean result = TRUE;
-
-    if (gtk_widget_is_drawable(widget)) {
-	cairo_t * cr = gdk_cairo_create(gtk_widget_get_window(widget));
-        result = draw(widget, cr);
-	cairo_destroy(cr);
-    }
-
-    return result;
-}
-#endif
-
 // PUBLIC CALL:
 void sp_icon_fetch_pixbuf( SPIcon *icon )
 {
diff --git a/src/widgets/ink-action.cpp b/src/widgets/ink-action.cpp
index ace99d9aa..52999dcce 100644
--- a/src/widgets/ink-action.cpp
+++ b/src/widgets/ink-action.cpp
@@ -2,18 +2,12 @@
 #include "icon-size.h"
 #include <glib/gi18n.h>
 
-
+#include "widgets/image-menu-item.h"
 #include "widgets/ink-action.h"
-
 #include "widgets/button.h"
 
 #include <gtk/gtk.h>
 
-#if GTK_CHECK_VERSION(3,0,0)
-    // Fork of gtk-imagemenuitem to continue support
-    #include "widgets/image-menu-item.h"
-
-#endif
 
 static void ink_action_finalize( GObject* obj );
 static void ink_action_get_property( GObject* obj, guint propId, GValue* value, GParamSpec * pspec );
@@ -165,12 +159,7 @@ static GtkWidget* ink_action_create_menu_item( GtkAction* action )
     if ( act->private_data->iconId ) {
         gchar* label = 0;
         g_object_get( G_OBJECT(act), "label", &label, NULL );
-
-#if GTK_CHECK_VERSION(3,0,0)
         item = image_menu_item_new_with_mnemonic( label );
-#else
-        item = gtk_image_menu_item_new_with_mnemonic( label );
-#endif
 
         GtkWidget* child = sp_icon_new( Inkscape::ICON_SIZE_MENU, act->private_data->iconId );
         // TODO this work-around is until SPIcon will live properly inside of a popup menu
@@ -185,12 +174,7 @@ static GtkWidget* ink_action_create_menu_item( GtkAction* action )
             }
         }
         gtk_widget_show_all( child );
-
-#if GTK_CHECK_VERSION(3,0,0)
         image_menu_item_set_image( IMAGE_MENU_ITEM(item), child );
-#else
-        gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(item), child );
-#endif
 
         g_free( label );
         label = 0;
@@ -393,15 +377,9 @@ static GtkWidget* ink_toggle_action_create_tool_item( GtkAction* action )
         if ( act->private_data->iconId ) {
             GtkWidget* child = sp_icon_new( act->private_data->iconSize, act->private_data->iconId );
 
-#if GTK_CHECK_VERSION(3,0,0)
 	    gtk_widget_set_hexpand(child, FALSE);
 	    gtk_widget_set_vexpand(child, FALSE);
 	    gtk_tool_button_set_icon_widget(button, child);
-#else
-            GtkWidget* align = gtk_alignment_new( 0.5, 0.5, 0.0, 0.0 );
-            gtk_container_add( GTK_CONTAINER(align), child );
-            gtk_tool_button_set_icon_widget( button, align );
-#endif
         } else {
             gchar *label = 0;
             g_object_get( G_OBJECT(action), "short_label", &label, NULL );
@@ -430,18 +408,10 @@ static void ink_toggle_action_update_icon( InkToggleAction* action )
                     GtkToolButton* button = GTK_TOOL_BUTTON(proxies->data);
 
                     GtkWidget* child = sp_icon_new( action->private_data->iconSize, action->private_data->iconId );
-
-#if GTK_CHECK_VERSION(3,0,0)
 		    gtk_widget_set_hexpand(child, FALSE);
 		    gtk_widget_set_vexpand(child, FALSE);
 		    gtk_widget_show_all(child);
 		    gtk_tool_button_set_icon_widget(button, child);
-#else
-                    GtkWidget* align = gtk_alignment_new( 0.5, 0.5, 0.0, 0.0 );
-                    gtk_container_add( GTK_CONTAINER(align), child );
-                    gtk_widget_show_all( align );
-                    gtk_tool_button_set_icon_widget( button, align );
-#endif
                 }
             }
 
@@ -610,16 +580,9 @@ static GtkWidget* ink_radio_action_create_tool_item( GtkAction* action )
             GtkToolButton* button = GTK_TOOL_BUTTON(item);
 
             GtkWidget* child = sp_icon_new( act->private_data->iconSize, act->private_data->iconId );
-
-#if GTK_CHECK_VERSION(3,0,0)
 	    gtk_widget_set_hexpand(child, FALSE);
 	    gtk_widget_set_vexpand(child, FALSE);
             gtk_tool_button_set_icon_widget(button, child);
-#else
-            GtkWidget* align = gtk_alignment_new( 0.5, 0.5, 0.0, 0.0 );
-            gtk_container_add( GTK_CONTAINER(align), child );
-            gtk_tool_button_set_icon_widget( button, align );
-#endif
         } else {
             // For now trigger a warning but don't do anything else
             GtkToolButton* button = GTK_TOOL_BUTTON(item);
diff --git a/src/widgets/ink-comboboxentry-action.cpp b/src/widgets/ink-comboboxentry-action.cpp
index ec5e26cf5..2fecb06a4 100644
--- a/src/widgets/ink-comboboxentry-action.cpp
+++ b/src/widgets/ink-comboboxentry-action.cpp
@@ -371,16 +371,10 @@ GtkWidget* create_tool_item( GtkAction* action )
     g_free( combobox_name );
 
     {
-#if GTK_CHECK_VERSION(3,0,0)
         gtk_widget_set_halign(comboBoxEntry, GTK_ALIGN_START);
         gtk_widget_set_hexpand(comboBoxEntry, FALSE);
         gtk_widget_set_vexpand(comboBoxEntry, FALSE);
         gtk_container_add(GTK_CONTAINER(item), comboBoxEntry);
-#else
-        GtkWidget *align = gtk_alignment_new(0, 0.5, 0, 0);
-        gtk_container_add( GTK_CONTAINER(align), comboBoxEntry );
-        gtk_container_add( GTK_CONTAINER(item), align );
-#endif
     }
 
     ink_comboboxentry_action->combobox = GTK_COMBO_BOX (comboBoxEntry);
@@ -414,11 +408,7 @@ GtkWidget* create_tool_item( GtkAction* action )
     // Optionally widen the combobox width... which widens the drop-down list in list mode.
     if( ink_comboboxentry_action->extra_width > 0 ) {
       GtkRequisition req;
-#if GTK_CHECK_VERSION(3,0,0)
       gtk_widget_get_preferred_size(GTK_WIDGET(ink_comboboxentry_action->combobox), &req, NULL);
-#else
-      gtk_widget_size_request( GTK_WIDGET( ink_comboboxentry_action->combobox ), &req );
-#endif
       gtk_widget_set_size_request( GTK_WIDGET( ink_comboboxentry_action->combobox ),
 				   req.width + ink_comboboxentry_action->extra_width, -1 );
     }
@@ -635,11 +625,7 @@ void ink_comboboxentry_action_set_extra_width( Ink_ComboBoxEntry_Action* action,
   // Widget may not have been created....
   if( action->combobox ) {
     GtkRequisition req;
-#if GTK_CHECK_VERSION(3,0,0)
     gtk_widget_get_preferred_size(GTK_WIDGET(action->combobox), &req, NULL);
-#else
-    gtk_widget_size_request( GTK_WIDGET( action->combobox ), &req );
-#endif
     gtk_widget_set_size_request( GTK_WIDGET( action->combobox ), req.width + action->extra_width, -1 );
   }
 }
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 58a178aec..a554f3cde 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -134,11 +134,7 @@ static SPGradientSelector *getGradientFromData(SPPaintSelector const *psel)
     return grad;
 }
 
-#if GTK_CHECK_VERSION(3,0,0)
 G_DEFINE_TYPE(SPPaintSelector, sp_paint_selector, GTK_TYPE_BOX);
-#else
-G_DEFINE_TYPE(SPPaintSelector, sp_paint_selector, GTK_TYPE_VBOX);
-#endif
 
 static void
 sp_paint_selector_class_init(SPPaintSelectorClass *klass)
@@ -197,19 +193,13 @@ sp_paint_selector_class_init(SPPaintSelectorClass *klass)
 static void
 sp_paint_selector_init(SPPaintSelector *psel)
 {
-#if GTK_CHECK_VERSION(3,0,0)
     gtk_orientable_set_orientation(GTK_ORIENTABLE(psel), GTK_ORIENTATION_VERTICAL);
-#endif
 
     psel->mode = static_cast<SPPaintSelector::Mode>(-1); // huh?  do you mean 0xff?  --  I think this means "not in the enum"
 
     /* Paint style button box */
-#if GTK_CHECK_VERSION(3,0,0)
     psel->style = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_box_set_homogeneous(GTK_BOX(psel->style), FALSE);
-#else
-    psel->style = gtk_hbox_new(FALSE, 0);
-#endif
     gtk_widget_show(psel->style);
     gtk_container_set_border_width(GTK_CONTAINER(psel->style), 4);
     gtk_box_pack_start(GTK_BOX(psel), psel->style, FALSE, FALSE, 0);
@@ -236,12 +226,8 @@ sp_paint_selector_init(SPPaintSelector *psel)
 
     /* Fillrule */
     {
-#if GTK_CHECK_VERSION(3,0,0)
-    psel->fillrulebox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-    gtk_box_set_homogeneous(GTK_BOX(psel->fillrulebox), FALSE);
-#else
-        psel->fillrulebox = gtk_hbox_new(FALSE, 0);
-#endif
+        psel->fillrulebox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+        gtk_box_set_homogeneous(GTK_BOX(psel->fillrulebox), FALSE);
         gtk_box_pack_end(GTK_BOX(psel->style), psel->fillrulebox, FALSE, FALSE, 0);
 
         GtkWidget *w;
@@ -270,22 +256,14 @@ sp_paint_selector_init(SPPaintSelector *psel)
 
     /* Frame */
     psel->label = gtk_label_new("");
-#if GTK_CHECK_VERSION(3,0,0)
-    GtkWidget *lbbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
+    auto lbbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
     gtk_box_set_homogeneous(GTK_BOX(lbbox), FALSE);
-#else
-    GtkWidget *lbbox = gtk_hbox_new(FALSE, 4);
-#endif
     gtk_widget_show(psel->label);
     gtk_box_pack_start(GTK_BOX(lbbox), psel->label, false, false, 4);
     gtk_box_pack_start(GTK_BOX(psel), lbbox, false, false, 4);
 
-#if GTK_CHECK_VERSION(3,0,0)
     psel->frame = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
     gtk_box_set_homogeneous(GTK_BOX(psel->frame), FALSE);
-#else
-    psel->frame = gtk_vbox_new(FALSE, 4);
-#endif
     gtk_widget_show(psel->frame);
     //gtk_container_set_border_width(GTK_CONTAINER(psel->frame), 0);
     gtk_box_pack_start(GTK_BOX(psel), psel->frame, TRUE, TRUE, 0);
@@ -700,12 +678,8 @@ static void sp_paint_selector_set_mode_color(SPPaintSelector *psel, SPPaintSelec
         sp_paint_selector_clear_frame(psel);
         /* Create new color selector */
         /* Create vbox */
-#if GTK_CHECK_VERSION(3,0,0)
-    GtkWidget *vb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
-    gtk_box_set_homogeneous(GTK_BOX(vb), FALSE);
-#else
-        GtkWidget *vb = gtk_vbox_new(FALSE, 4);
-#endif
+        auto vb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
+        gtk_box_set_homogeneous(GTK_BOX(vb), FALSE);
         gtk_widget_show(vb);
 
         /* Color selector */
@@ -1046,21 +1020,13 @@ static void sp_paint_selector_set_mode_pattern(SPPaintSelector *psel, SPPaintSel
         sp_paint_selector_clear_frame(psel);
 
         /* Create vbox */
-#if GTK_CHECK_VERSION(3,0,0)
         tbl = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
         gtk_box_set_homogeneous(GTK_BOX(tbl), FALSE);
-#else
-        tbl = gtk_vbox_new(FALSE, 4);
-#endif
         gtk_widget_show(tbl);
 
         {
-#if GTK_CHECK_VERSION(3,0,0)
-            GtkWidget *hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
+            auto hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
             gtk_box_set_homogeneous(GTK_BOX(hb), FALSE);
-#else
-            GtkWidget *hb = gtk_hbox_new(FALSE, 1);
-#endif
 
             /**
              * Create a combo_box and store with 4 columns,
@@ -1088,13 +1054,9 @@ static void sp_paint_selector_set_mode_pattern(SPPaintSelector *psel, SPPaintSel
         }
 
         {
-#if GTK_CHECK_VERSION(3,0,0)
-            GtkWidget *hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+            auto hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
             gtk_box_set_homogeneous(GTK_BOX(hb), FALSE);
-#else
-            GtkWidget *hb = gtk_hbox_new(FALSE, 0);
-#endif
-            GtkWidget *l = gtk_label_new(NULL);
+            auto l = gtk_label_new(NULL);
             gtk_label_set_markup(GTK_LABEL(l), _("Use the <b>Node tool</b> to adjust position, scale, and rotation of the pattern on canvas. Use <b>Object &gt; Pattern &gt; Objects to Pattern</b> to create a new pattern from selection."));
             gtk_label_set_line_wrap(GTK_LABEL(l), true);
             gtk_widget_set_size_request(l, 180, -1);
diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h
index 23c2dd456..dde14b6a6 100644
--- a/src/widgets/paint-selector.h
+++ b/src/widgets/paint-selector.h
@@ -40,11 +40,7 @@ class SPStyle;
  * Generic paint selector widget.
  */
 struct SPPaintSelector {
-#if GTK_CHECK_VERSION(3,0,0)
     GtkBox  vbox;
-#else
-    GtkVBox vbox;
-#endif
 
     enum Mode {
         MODE_EMPTY,
@@ -130,11 +126,7 @@ enum {COMBO_COL_LABEL=0, COMBO_COL_STOCK=1, COMBO_COL_PATTERN=2, COMBO_COL_SEP=3
 
 /// The SPPaintSelector vtable
 struct SPPaintSelectorClass {
-#if GTK_CHECK_VERSION(3,0,0)
     GtkBoxClass parent_class;
-#else
-    GtkVBoxClass parent_class;
-#endif
 
     void (* mode_changed) (SPPaintSelector *psel, SPPaintSelector::Mode mode);
 
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index 9851b0606..7dfa18f49 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -415,12 +415,8 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb
     g_object_set_data(G_OBJECT(spw), "dtw", desktop->getCanvas());
 
     // The vb frame holds all other widgets and is used to set sensitivity depending on selection state.
-#if GTK_CHECK_VERSION(3,0,0)
-    GtkWidget *vb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+    auto vb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_box_set_homogeneous(GTK_BOX(vb), FALSE);
-#else
-    GtkWidget *vb = gtk_hbox_new(FALSE, 0);
-#endif
     gtk_widget_show(vb);
     gtk_container_add(GTK_CONTAINER(spw), vb);
 
diff --git a/src/widgets/sp-color-selector.cpp b/src/widgets/sp-color-selector.cpp
index 93eaaee8b..1d448b67b 100644
--- a/src/widgets/sp-color-selector.cpp
+++ b/src/widgets/sp-color-selector.cpp
@@ -32,11 +32,7 @@ static guint csel_signals[LAST_SIGNAL] = {0};
 
 double ColorSelector::_epsilon = 1e-4;
 
-#if GTK_CHECK_VERSION(3,0,0)
 G_DEFINE_TYPE(SPColorSelector, sp_color_selector, GTK_TYPE_BOX);
-#else
-G_DEFINE_TYPE(SPColorSelector, sp_color_selector, GTK_TYPE_VBOX);
-#endif
 
 void sp_color_selector_class_init( SPColorSelectorClass *klass )
 {
@@ -86,9 +82,7 @@ void sp_color_selector_class_init( SPColorSelectorClass *klass )
 
 void sp_color_selector_init( SPColorSelector *csel )
 {
-#if GTK_CHECK_VERSION(3,0,0)
     gtk_orientable_set_orientation(GTK_ORIENTABLE(csel), GTK_ORIENTATION_VERTICAL);
-#endif
 
     if ( csel->base )
     {
diff --git a/src/widgets/sp-color-selector.h b/src/widgets/sp-color-selector.h
index 75cb79b00..14a9fccdf 100644
--- a/src/widgets/sp-color-selector.h
+++ b/src/widgets/sp-color-selector.h
@@ -64,21 +64,12 @@ private:
 #define SP_COLOR_SELECTOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), SP_TYPE_COLOR_SELECTOR, SPColorSelectorClass))
 
 struct SPColorSelector {
-#if GTK_CHECK_VERSION(3,0,0)
     GtkBox vbox;
-#else
-    GtkVBox vbox;
-#endif
-
     ColorSelector* base;
 };
 
 struct SPColorSelectorClass {
-#if GTK_CHECK_VERSION(3,0,0)
     GtkBoxClass parent_class;
-#else
-    GtkVBoxClass parent_class;
-#endif
 
     const gchar **name;
     guint submode_count;
diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp
index 5ab6b1bb5..0a4e722a5 100644
--- a/src/widgets/sp-widget.cpp
+++ b/src/widgets/sp-widget.cpp
@@ -41,7 +41,6 @@ public:
     static void show(GtkWidget *widget);
     static void hide(GtkWidget *widget);
 
-#if GTK_CHECK_VERSION(3,0,0)
     static void getPreferredWidth(GtkWidget *widget,
                                   gint *minimal_width,
                                   gint *natural_width);
@@ -50,10 +49,6 @@ public:
                                    gint *minimal_height,
                                    gint *natural_height);
     static gboolean draw(GtkWidget *widget, cairo_t *cr);
-#else
-    static void sizeRequest(GtkWidget *widget, GtkRequisition *requisition);
-    static gboolean expose(GtkWidget *widget, GdkEventExpose *event);
-#endif
 
     static void sizeAllocate(GtkWidget *widget, GtkAllocation *allocation);
     static void modifySelectionCB(Selection *selection, guint flags, SPWidget *spw);
@@ -120,14 +115,9 @@ sp_widget_class_init(SPWidgetClass *klass)
 
     widget_class->show = SPWidgetImpl::show;
     widget_class->hide = SPWidgetImpl::hide;
-#if GTK_CHECK_VERSION(3,0,0)
     widget_class->get_preferred_width = SPWidgetImpl::getPreferredWidth;
     widget_class->get_preferred_height = SPWidgetImpl::getPreferredHeight;
     widget_class->draw = SPWidgetImpl::draw;
-#else
-    widget_class->size_request = SPWidgetImpl::sizeRequest;
-    widget_class->expose_event = SPWidgetImpl::expose;
-#endif
     widget_class->size_allocate = SPWidgetImpl::sizeAllocate;
 }
 
@@ -207,27 +197,18 @@ void SPWidgetImpl::hide(GtkWidget *widget)
     }
 }
 
-#if GTK_CHECK_VERSION(3,0,0)
 gboolean SPWidgetImpl::draw(GtkWidget *widget, cairo_t *cr)
-#else
-gboolean SPWidgetImpl::expose(GtkWidget *widget, GdkEventExpose *event)
-#endif
 {
     GtkBin    *bin = GTK_BIN(widget);
     GtkWidget *child = gtk_bin_get_child(bin);
 
     if (child) {
-#if GTK_CHECK_VERSION(3,0,0)
         gtk_container_propagate_draw(GTK_CONTAINER(widget), child, cr);
-#else
-        gtk_container_propagate_expose(GTK_CONTAINER(widget), child, event);
-#endif
     }
 
     return FALSE;
 }
 
-#if GTK_CHECK_VERSION(3,0,0)
 void SPWidgetImpl::getPreferredWidth(GtkWidget *widget, gint *minimal_width, gint *natural_width)
 {
     GtkBin    *bin   = GTK_BIN(widget);
@@ -247,17 +228,6 @@ void SPWidgetImpl::getPreferredHeight(GtkWidget *widget, gint *minimal_height, g
         gtk_widget_get_preferred_height(child, minimal_height, natural_height);
     }
 }
-#else
-void SPWidgetImpl::sizeRequest(GtkWidget *widget, GtkRequisition *requisition)
-{
-    GtkBin    *bin   = GTK_BIN(widget);
-    GtkWidget *child = gtk_bin_get_child(bin);
-
-    if (child) {
-        gtk_widget_size_request(child, requisition);
-    }
-}
-#endif
 
 void SPWidgetImpl::sizeAllocate(GtkWidget *widget, GtkAllocation *allocation)
 {
diff --git a/src/widgets/sp-xmlview-attr-list.cpp b/src/widgets/sp-xmlview-attr-list.cpp
index a4c00db7c..8fe01a33d 100644
--- a/src/widgets/sp-xmlview-attr-list.cpp
+++ b/src/widgets/sp-xmlview-attr-list.cpp
@@ -20,11 +20,7 @@
 #include "../xml/node-event-vector.h"
 #include "sp-xmlview-attr-list.h"
 
-#if GTK_CHECK_VERSION(3,0,0)
 static void sp_xmlview_attr_list_destroy(GtkWidget * object);
-#else
-static void sp_xmlview_attr_list_destroy(GtkObject * object);
-#endif
 
 static void event_attr_changed (Inkscape::XML::Node * repr, const gchar * name, const gchar * old_value, const gchar * new_value, bool is_interactive, gpointer data);
 
@@ -87,13 +83,8 @@ G_DEFINE_TYPE(SPXMLViewAttrList, sp_xmlview_attr_list, GTK_TYPE_TREE_VIEW);
 
 void sp_xmlview_attr_list_class_init (SPXMLViewAttrListClass * klass)
 {
-#if GTK_CHECK_VERSION(3,0,0)
-	GtkWidgetClass * widget_class = GTK_WIDGET_CLASS(klass);
+	auto widget_class = GTK_WIDGET_CLASS(klass);
 	widget_class->destroy = sp_xmlview_attr_list_destroy;
-#else
-	GtkObjectClass * object_class = GTK_OBJECT_CLASS(klass);
-	object_class->destroy = sp_xmlview_attr_list_destroy;
-#endif
 
         g_signal_new("row-value-changed",
                       G_TYPE_FROM_CLASS(klass),
@@ -112,11 +103,7 @@ sp_xmlview_attr_list_init (SPXMLViewAttrList * list)
 	list->repr = NULL;
 }
 
-#if GTK_CHECK_VERSION(3,0,0)
 void sp_xmlview_attr_list_destroy(GtkWidget * object)
-#else
-void sp_xmlview_attr_list_destroy(GtkObject * object)
-#endif
 {
 	SPXMLViewAttrList * list;
 
@@ -125,11 +112,7 @@ void sp_xmlview_attr_list_destroy(GtkObject * object)
 	g_object_unref(list->store);
 	sp_xmlview_attr_list_set_repr (list, NULL);
 
-#if GTK_CHECK_VERSION(3,0,0)
 	GTK_WIDGET_CLASS(sp_xmlview_attr_list_parent_class)->destroy (object);
-#else
-	GTK_OBJECT_CLASS(sp_xmlview_attr_list_parent_class)->destroy (object);
-#endif
 }
 
 void sp_xmlview_attr_list_select_row_by_key(SPXMLViewAttrList * list, const gchar *name)
diff --git a/src/widgets/sp-xmlview-content.cpp b/src/widgets/sp-xmlview-content.cpp
index a1d8475ba..6e59ba3cd 100644
--- a/src/widgets/sp-xmlview-content.cpp
+++ b/src/widgets/sp-xmlview-content.cpp
@@ -23,11 +23,7 @@
 
 using Inkscape::DocumentUndo;
 
-#if GTK_CHECK_VERSION(3,0,0)
 static void sp_xmlview_content_destroy(GtkWidget * object);
-#else
-static void sp_xmlview_content_destroy(GtkObject * object);
-#endif
 
 void sp_xmlview_content_changed (GtkTextBuffer *tb, SPXMLViewContent *text);
 
@@ -80,13 +76,8 @@ G_DEFINE_TYPE(SPXMLViewContent, sp_xmlview_content, GTK_TYPE_TEXT_VIEW);
 
 void sp_xmlview_content_class_init(SPXMLViewContentClass * klass)
 {
-#if GTK_CHECK_VERSION(3,0,0)
-    GtkWidgetClass * widget_class = GTK_WIDGET_CLASS(klass);
+    auto widget_class = GTK_WIDGET_CLASS(klass);
     widget_class->destroy = sp_xmlview_content_destroy;
-#else
-    GtkObjectClass * object_class = GTK_OBJECT_CLASS(klass);
-    object_class->destroy = sp_xmlview_content_destroy;
-#endif
 }
 
 void
@@ -96,21 +87,13 @@ sp_xmlview_content_init (SPXMLViewContent *text)
     text->blocked = FALSE;
 }
 
-#if GTK_CHECK_VERSION(3,0,0)
 void sp_xmlview_content_destroy(GtkWidget * object)
-#else
-void sp_xmlview_content_destroy(GtkObject * object)
-#endif
 {
     SPXMLViewContent * text = SP_XMLVIEW_CONTENT (object);
 
     sp_xmlview_content_set_repr (text, NULL);
 
-#if GTK_CHECK_VERSION(3,0,0)
     GTK_WIDGET_CLASS (sp_xmlview_content_parent_class)->destroy (object);
-#else
-    GTK_OBJECT_CLASS (sp_xmlview_content_parent_class)->destroy (object);
-#endif
 }
 
 void
diff --git a/src/widgets/sp-xmlview-tree.cpp b/src/widgets/sp-xmlview-tree.cpp
index 5dff9adf3..131ac16bf 100644
--- a/src/widgets/sp-xmlview-tree.cpp
+++ b/src/widgets/sp-xmlview-tree.cpp
@@ -23,11 +23,7 @@ struct NodeData {
 
 enum { STORE_TEXT_COL = 0, STORE_DATA_COL, STORE_REPR_COL, STORE_N_COLS };
 
-#if GTK_CHECK_VERSION(3,0,0)
 static void sp_xmlview_tree_destroy(GtkWidget * object);
-#else
-static void sp_xmlview_tree_destroy(GtkObject * object);
-#endif
 
 static NodeData * node_data_new (SPXMLViewTree * tree, GtkTreeIter * node, GtkTreeRowReference  *rowref, Inkscape::XML::Node * repr);
 
@@ -121,13 +117,8 @@ G_DEFINE_TYPE(SPXMLViewTree, sp_xmlview_tree, GTK_TYPE_TREE_VIEW);
 
 void sp_xmlview_tree_class_init(SPXMLViewTreeClass * klass)
 {
-#if GTK_CHECK_VERSION(3,0,0)
-    GtkWidgetClass * widget_class = GTK_WIDGET_CLASS(klass);
+    auto widget_class = GTK_WIDGET_CLASS(klass);
     widget_class->destroy = sp_xmlview_tree_destroy;
-#else
-    GtkObjectClass * object_class = GTK_OBJECT_CLASS(klass);
-    object_class->destroy = sp_xmlview_tree_destroy;
-#endif
     
     // Signal for when a tree drag and drop has completed
     g_signal_new (  "tree_move",
@@ -148,22 +139,13 @@ sp_xmlview_tree_init (SPXMLViewTree * tree)
 	tree->dndactive = FALSE;
 }
 
-
-#if GTK_CHECK_VERSION(3,0,0)
 void sp_xmlview_tree_destroy(GtkWidget * object)
-#else
-void sp_xmlview_tree_destroy(GtkObject * object)
-#endif
 {
 	SPXMLViewTree * tree = SP_XMLVIEW_TREE (object);
 
 	sp_xmlview_tree_set_repr (tree, NULL);
 
-#if GTK_CHECK_VERSION(3,0,0)
 	GTK_WIDGET_CLASS(sp_xmlview_tree_parent_class)->destroy (object);
-#else
-	GTK_OBJECT_CLASS(sp_xmlview_tree_parent_class)->destroy (object);
-#endif
 }
 
 /*
diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp
index 5500e1068..c0d4d9d58 100644
--- a/src/widgets/spw-utilities.cpp
+++ b/src/widgets/spw-utilities.cpp
@@ -19,12 +19,7 @@
 
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
-
-#if GTK_CHECK_VERSION(3,0,0)
 #include <gtkmm/grid.h>
-#else
-#include <gtkmm/table.h>
-#endif
 
 #include "selection.h"
 
@@ -36,11 +31,7 @@
  * Creates a label widget with the given text, at the given col, row
  * position in the table.
  */
-#if GTK_CHECK_VERSION(3,0,0)
 Gtk::Label * spw_label(Gtk::Grid *table, const gchar *label_text, int col, int row, Gtk::Widget* target)
-#else
-Gtk::Label * spw_label(Gtk::Table *table, const gchar *label_text, int col, int row, Gtk::Widget* target)
-#endif
 {
   Gtk::Label *label_widget = new Gtk::Label();
   g_assert(label_widget != NULL);
@@ -56,7 +47,6 @@ Gtk::Label * spw_label(Gtk::Table *table, const gchar *label_text, int col, int
   label_widget->set_alignment(1.0, 0.5);
   label_widget->show();
 
-#if GTK_CHECK_VERSION(3,0,0)
   label_widget->set_hexpand();
   label_widget->set_halign(Gtk::ALIGN_FILL);
   label_widget->set_valign(Gtk::ALIGN_CENTER);
@@ -70,9 +60,6 @@ Gtk::Label * spw_label(Gtk::Table *table, const gchar *label_text, int col, int
   #endif
 
   table->attach(*label_widget, col, row, 1, 1);
-#else
-  table->attach(*label_widget, col, col+1, row, row+1, (Gtk::EXPAND | Gtk::FILL), static_cast<Gtk::AttachOptions>(0), 4, 0);
-#endif
 
   return label_widget;
 }
@@ -84,16 +71,9 @@ spw_label_old(GtkWidget *table, const gchar *label_text, int col, int row)
 
   label_widget = gtk_label_new (label_text);
   g_assert(label_widget != NULL);
-
-#if GTK_CHECK_VERSION(3,0,0)
   gtk_widget_set_halign(label_widget, GTK_ALIGN_END);
-#else
-  gtk_misc_set_alignment (GTK_MISC (label_widget), 1.0, 0.5);
-#endif
-
   gtk_widget_show (label_widget);
 
-#if GTK_CHECK_VERSION(3,0,0)
 #if GTK_CHECK_VERSION(3,12,0)
   gtk_widget_set_margin_start(label_widget, 4);
   gtk_widget_set_margin_end(label_widget, 4);
@@ -105,10 +85,6 @@ spw_label_old(GtkWidget *table, const gchar *label_text, int col, int row)
   gtk_widget_set_halign(label_widget, GTK_ALIGN_FILL);
   gtk_widget_set_valign(label_widget, GTK_ALIGN_CENTER);
   gtk_grid_attach(GTK_GRID(table), label_widget, col, row, 1, 1);
-#else
-  gtk_table_attach(GTK_TABLE (table), label_widget, col, col+1, row, row+1,
-		    (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)0, 4, 0);
-#endif
 
   return label_widget;
 }
@@ -117,25 +93,16 @@ spw_label_old(GtkWidget *table, const gchar *label_text, int col, int row)
  * Creates a horizontal layout manager with 4-pixel spacing between children
  * and space for 'width' columns.
  */
-#if GTK_CHECK_VERSION(3,0,0)
 Gtk::HBox * spw_hbox(Gtk::Grid * table, int width, int col, int row)
-#else
-Gtk::HBox * spw_hbox(Gtk::Table * table, int width, int col, int row)
-#endif
 {
   /* Create a new hbox with a 4-pixel spacing between children */
   Gtk::HBox *hb = new Gtk::HBox(false, 4);
   g_assert(hb != NULL);
   hb->show();
-
-#if GTK_CHECK_VERSION(3,0,0)
   hb->set_hexpand();
   hb->set_halign(Gtk::ALIGN_FILL);
   hb->set_valign(Gtk::ALIGN_CENTER);
   table->attach(*hb, col, row, width, 1);
-#else
-  table->attach(*hb, col, col+width, row, row+1, (Gtk::EXPAND | Gtk::FILL), static_cast<Gtk::AttachOptions>(0), 0, 0);
-#endif
 
   return hb;
 }
@@ -177,37 +144,21 @@ spw_checkbutton(GtkWidget * dialog, GtkWidget * table,
   g_assert(table  != NULL);
 
   GtkWidget *l = gtk_label_new (label);
-
-#if GTK_CHECK_VERSION(3,0,0)
   gtk_widget_set_halign(l, GTK_ALIGN_END);
-#else
-  gtk_misc_set_alignment (GTK_MISC (l), 1.0, 0.5);
-#endif
-
   gtk_widget_show (l);
 
-#if GTK_CHECK_VERSION(3,0,0)
   gtk_widget_set_halign(l, GTK_ALIGN_FILL);
   gtk_widget_set_hexpand(l, TRUE);
   gtk_widget_set_valign(l, GTK_ALIGN_CENTER);
   gtk_grid_attach(GTK_GRID(table), l, 0, row, 1, 1);
-#else
-  gtk_table_attach (GTK_TABLE (table), l, 0, 1, row, row+1,
-		    (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)0, 0, 0);
-#endif
 
   b = gtk_check_button_new ();
   gtk_widget_show (b);
 
-#if GTK_CHECK_VERSION(3,0,0)
   gtk_widget_set_halign(b, GTK_ALIGN_FILL);
   gtk_widget_set_hexpand(b, TRUE);
   gtk_widget_set_valign(b, GTK_ALIGN_CENTER);
   gtk_grid_attach(GTK_GRID(table), b, 1, row, 1, 1);
-#else
-  gtk_table_attach (GTK_TABLE (table), b, 1, 2, row, row+1,
-		    (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)0, 0, 0);
-#endif
 
   g_object_set_data (G_OBJECT (b), "key", key);
   g_object_set_data (G_OBJECT (dialog), key, b);
@@ -235,16 +186,10 @@ spw_dropdown(GtkWidget * dialog, GtkWidget * table,
   spw_label_old(table, label_text, 0, row);
 
   gtk_widget_show (selector);
-
-#if GTK_CHECK_VERSION(3,0,0)
   gtk_widget_set_halign(selector, GTK_ALIGN_FILL);
   gtk_widget_set_hexpand(selector, TRUE);
   gtk_widget_set_valign(selector, GTK_ALIGN_CENTER);
   gtk_grid_attach(GTK_GRID(table), selector, 1, row, 1, 1);
-#else
-  gtk_table_attach (GTK_TABLE (table), selector, 1, 2, row, row+1,
-		    (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)0, 0, 0);
-#endif
 
   g_object_set_data (G_OBJECT (dialog), key, selector);
   return selector;
@@ -255,8 +200,7 @@ sp_set_font_size_recursive (GtkWidget *w, gpointer font)
 {
 	guint size = GPOINTER_TO_UINT (font);
 
-#if GTK_CHECK_VERSION(3,0,0)
-        GtkCssProvider *css_provider = gtk_css_provider_new();
+        auto css_provider = gtk_css_provider_new();
 
         const double pt_size = size / static_cast<double>(PANGO_SCALE);
         std::ostringstream css_data;
@@ -268,25 +212,16 @@ sp_set_font_size_recursive (GtkWidget *w, gpointer font)
                                         css_data.str().c_str(),
                                         -1, NULL);
 
-        GtkStyleContext *style_context = gtk_widget_get_style_context(w);
+        auto style_context = gtk_widget_get_style_context(w);
         gtk_style_context_add_provider(style_context,
                                        GTK_STYLE_PROVIDER(css_provider),
                                        GTK_STYLE_PROVIDER_PRIORITY_USER);
-#else
-	PangoFontDescription* pan = pango_font_description_new ();
-	pango_font_description_set_size (pan, size);
-	gtk_widget_modify_font (w, pan);
-#endif
 
 	if (GTK_IS_CONTAINER(w)) {
 		gtk_container_foreach (GTK_CONTAINER(w), (GtkCallback) sp_set_font_size_recursive, font);
 	}
 
-#if GTK_CHECK_VERSION(3,0,0)
         g_object_unref(css_provider);
-#else
-	pango_font_description_free (pan);
-#endif
 }
 
 void
diff --git a/src/widgets/spw-utilities.h b/src/widgets/spw-utilities.h
index 31f29e026..71b451631 100644
--- a/src/widgets/spw-utilities.h
+++ b/src/widgets/spw-utilities.h
@@ -20,25 +20,13 @@
 
 namespace Gtk {
   class Label;
-
-#if GTK_CHECK_VERSION(3,0,0)
   class Grid;
-#else
-  class Table;
-#endif
-
   class HBox;
   class Widget;
 }
 
-#if GTK_CHECK_VERSION(3,0,0)
 Gtk::Label * spw_label(Gtk::Grid *table, gchar const *label_text, int col, int row, Gtk::Widget *target);
 Gtk::HBox * spw_hbox(Gtk::Grid *table, int width, int col, int row);
-#else
-Gtk::Label * spw_label(Gtk::Table *table, gchar const *label_text, int col, int row, Gtk::Widget *target);
-Gtk::HBox * spw_hbox(Gtk::Table *table, int width, int col, int row);
-#endif
-
 GtkWidget * spw_label_old(GtkWidget *table, gchar const *label_text, int col, int row);
 
 GtkWidget *
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp
index 23acb74af..f256b466c 100644
--- a/src/widgets/text-toolbar.cpp
+++ b/src/widgets/text-toolbar.cpp
@@ -1562,8 +1562,7 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje
         g_object_set_data( holder, "TextFontFamilyAction", act );
 
         // Change style of drop-down from menu to list
-#if GTK_CHECK_VERSION(3,0,0)
-        GtkCssProvider *css_provider = gtk_css_provider_new();
+        auto css_provider = gtk_css_provider_new();
         gtk_css_provider_load_from_data(css_provider,
                                         "#TextFontFamilyAction_combobox {\n"
                                         "  -GtkComboBox-appears-as-list: true;\n"
@@ -1574,24 +1573,10 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje
                                         "}\n",
                                         -1, NULL);
 
-        GdkScreen *screen = gdk_screen_get_default();
+        auto screen = gdk_screen_get_default();
         gtk_style_context_add_provider_for_screen(screen,
                                                   GTK_STYLE_PROVIDER(css_provider),
                                                   GTK_STYLE_PROVIDER_PRIORITY_USER);
-#else
-        gtk_rc_parse_string (
-            "style \"dropdown-as-list-style\"\n"
-            "{\n"
-            "    GtkComboBox::appears-as-list = 1\n"
-            "}\n"
-            "widget \"*.TextFontFamilyAction_combobox\" style \"dropdown-as-list-style\""
-            "style \"fontfamily-separator-style\"\n"
-            "{\n"
-            "    GtkWidget::wide-separators = 1\n"
-            "    GtkWidget::separator-height = 6\n"
-            "}\n"
-            "widget \"*gtk-combobox-popup-window.GtkScrolledWindow.GtkTreeView\" style \"fontfamily-separator-style\"");
-#endif
     }
 
     /* Font size */