Drop remaining GTKMM 2 fallback support

(bzr r15023.2.7)

8 files changed, 27 insertions, 332 deletions

diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp
index 9d591d33d..7c6c22ba3 100644
--- a/src/widgets/dash-selector.cpp
+++ b/src/widgets/dash-selector.cpp
@@ -61,18 +61,9 @@ SPDashSelector::SPDashSelector()
     dash_combo.signal_changed().connect( sigc::mem_fun(*this, &SPDashSelector::on_selection) );
 
     this->pack_start(dash_combo, false, false, 0);
-
-#if WITH_GTKMM_3_0
     offset = Gtk::Adjustment::create(0.0, 0.0, 10.0, 0.1, 1.0, 0.0);
-#else
-    offset = new Gtk::Adjustment(0.0, 0.0, 10.0, 0.1, 1.0, 0.0);
-#endif
     offset->signal_value_changed().connect(sigc::mem_fun(*this, &SPDashSelector::offset_value_changed));
-#if WITH_GTKMM_3_0
-    Inkscape::UI::Widget::SpinButton *sb = new Inkscape::UI::Widget::SpinButton(offset, 0.1, 2);
-#else
-    Inkscape::UI::Widget::SpinButton *sb = new Inkscape::UI::Widget::SpinButton(*offset, 0.1, 2);
-#endif
+    auto sb = new Inkscape::UI::Widget::SpinButton(offset, 0.1, 2);
     sb->set_tooltip_text(_("Pattern offset"));
     sp_dialog_defocus_on_enter_cpp(sb);
     sb->show();
@@ -99,9 +90,6 @@ SPDashSelector::SPDashSelector()
 SPDashSelector::~SPDashSelector() {
     // FIXME: for some reason this doesn't get called; does the call to manage() in
     // sp_stroke_style_line_widget_new() not processed correctly?
-#if !WITH_GTKMM_3_0
-    delete offset;
-#endif
 }
 
 void SPDashSelector::prepareImageRenderer( Gtk::TreeModel::const_iterator const &row ) {
diff --git a/src/widgets/dash-selector.h b/src/widgets/dash-selector.h
index ec5a1cbd5..f176acf04 100644
--- a/src/widgets/dash-selector.h
+++ b/src/widgets/dash-selector.h
@@ -85,12 +85,7 @@ private:
     Glib::RefPtr<Gtk::ListStore> dash_store;
     Gtk::ComboBox       dash_combo;
     Gtk::CellRendererPixbuf image_renderer;
-
-#if WITH_GTKMM_3_0
     Glib::RefPtr<Gtk::Adjustment> offset;
-#else
-    Gtk::Adjustment     *offset;
-#endif
 
     static gchar const *const _prefs_path;
     int preview_width;
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index ef1f31751..8b035eb15 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -70,9 +70,7 @@
 #include "widget-sizes.h"
 
 #include "verbs.h"
-#if GTK_CHECK_VERSION(3,0,0)
-# include <gtkmm/cssprovider.h>
-#endif
+#include <gtkmm/cssprovider.h>
 #include <gtkmm/paned.h>
 #include <gtkmm/messagedialog.h>
 
@@ -256,16 +254,11 @@ Geom::Point
 SPDesktopWidget::window_get_pointer()
 {
     gint x,y;
-    GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(canvas));
-
-#if GTK_CHECK_VERSION(3,0,0)
-    GdkDisplay *display = gdk_window_get_display(window);
-    GdkDeviceManager *dm = gdk_display_get_device_manager(display);
-    GdkDevice *device = gdk_device_manager_get_client_pointer(dm);
+    auto window = gtk_widget_get_window(GTK_WIDGET(canvas));
+    auto display = gdk_window_get_display(window);
+    auto dm = gdk_display_get_device_manager(display);
+    auto device = gdk_device_manager_get_client_pointer(dm);
     gdk_window_get_device_position(window, device, &x, &y, NULL);
-#else
-    gdk_window_get_pointer(window, &x, &y, NULL);
-#endif
 
     return Geom::Point(x,y);
 }
@@ -344,21 +337,11 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     dtw->_interaction_disabled_counter = 0;
 
     /* Main table */
-#if GTK_CHECK_VERSION(3,0,0)
     dtw->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_widget_set_name(dtw->vbox, "DesktopMainTable");
-#else
-    dtw->vbox = gtk_vbox_new (FALSE, 0);
-#endif
     gtk_container_add( GTK_CONTAINER(dtw), GTK_WIDGET(dtw->vbox) );
-
-#if GTK_CHECK_VERSION(3,0,0)
     dtw->statusbar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_widget_set_name(dtw->statusbar, "DesktopStatusBar");
-#else
-    dtw->statusbar = gtk_hbox_new (FALSE, 0);
-#endif
-    //gtk_widget_set_usize (dtw->statusbar, -1, BOTTOM_BAR_HEIGHT);
     gtk_box_pack_end (GTK_BOX (dtw->vbox), dtw->statusbar, FALSE, TRUE, 0);
 
     {
@@ -366,19 +349,12 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
 
         dtw->panels = new SwatchesPanel("/embedded/swatches" /*false*/);
         dtw->panels->setOrientation(SP_ANCHOR_SOUTH);
-#if GTK_CHECK_VERSION(3,0,0)
         dtw->panels->set_vexpand(false);
-#endif
-
         gtk_box_pack_end( GTK_BOX( dtw->vbox ), GTK_WIDGET(dtw->panels->gobj()), FALSE, TRUE, 0 );
     }
 
-#if GTK_CHECK_VERSION(3,0,0)
     dtw->hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_widget_set_name(dtw->hbox, "DesktopHbox");
-#else
-    dtw->hbox = gtk_hbox_new(FALSE, 0);
-#endif
 
     gtk_box_pack_end( GTK_BOX (dtw->vbox), dtw->hbox, TRUE, TRUE, 0 );
     gtk_widget_show(dtw->hbox);
@@ -402,14 +378,12 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
                                                NULL,
                                                INKSCAPE_ICON("object-locked"),
                                                _("Toggle lock of all guides in the document"));
-#if GTK_CHECK_VERSION(3,0,0)
-    Glib::RefPtr<Gtk::CssProvider> guides_lock_style_provider = Gtk::CssProvider::create();
+    auto guides_lock_style_provider = Gtk::CssProvider::create();
     guides_lock_style_provider->load_from_data("GtkWidget { padding-left: 0; padding-right: 0; padding-top: 0; padding-bottom: 0; }");
-    Gtk::Widget * wnd = Glib::wrap(dtw->guides_lock);
+    auto wnd = Glib::wrap(dtw->guides_lock);
     wnd->set_name("LockGuides");
-    Glib::RefPtr<Gtk::StyleContext> context = wnd->get_style_context();
+    auto context = wnd->get_style_context();
     context->add_provider(guides_lock_style_provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-#endif
 
     /* Horizontal ruler */
     GtkWidget *eventbox = gtk_event_box_new ();
@@ -424,29 +398,13 @@ void SPDesktopWidget::init( SPDesktopWidget *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);
 
-#if GTK_CHECK_VERSION(3,0,0)
-    GtkWidget *tbl_wrapper = gtk_grid_new(); // Is this widget really needed?
+    auto tbl_wrapper = gtk_grid_new(); // Is this widget really needed?
     gtk_widget_set_name(tbl_wrapper, "CanvasTableWrapper");
     dtw->canvas_tbl = gtk_grid_new();
     gtk_widget_set_name(dtw->canvas_tbl, "CanvasTable");
     
     gtk_grid_attach(GTK_GRID(dtw->canvas_tbl), dtw->guides_lock, 0, 0, 1, 1);
     gtk_grid_attach(GTK_GRID(dtw->canvas_tbl), eventbox, 1, 0, 1, 1);
-#else
-    GtkWidget *tbl_wrapper = gtk_table_new(2, 3, FALSE);
-    dtw->canvas_tbl = gtk_table_new(3, 3, FALSE);
-   
-    gtk_table_attach(GTK_TABLE(dtw->canvas_tbl),
-                     dtw->guides_lock,
-                     0, 1,     0, 1, 
-		     GTK_FILL, GTK_FILL, 
-		     0,        0);
-    gtk_table_attach(GTK_TABLE(dtw->canvas_tbl),
-                 eventbox,
-                 1, 2,     0, 1, 
-	     GTK_FILL, GTK_FILL, 
-	     0,        0);
-#endif
     g_signal_connect (G_OBJECT (dtw->guides_lock), "toggled", G_CALLBACK (sp_update_guides_lock), dtw);
     gtk_box_pack_start( GTK_BOX(dtw->hbox), tbl_wrapper, TRUE, TRUE, 1 );
 
@@ -460,16 +418,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     sp_ruler_set_unit (SP_RULER (dtw->vruler), pt);
     gtk_widget_set_tooltip_text (dtw->vruler_box, gettext(pt->name_plural.c_str()));
     gtk_container_add (GTK_CONTAINER (eventbox), GTK_WIDGET (dtw->vruler));
-
-#if GTK_CHECK_VERSION(3,0,0)
     gtk_grid_attach(GTK_GRID(dtw->canvas_tbl), eventbox, 0, 1, 1, 1);
-#else
-    gtk_table_attach(GTK_TABLE (dtw->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);
     g_signal_connect (G_OBJECT (eventbox), "button_release_event", G_CALLBACK (sp_dt_vruler_event), dtw);
@@ -477,19 +426,10 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
 
     // Horizontal scrollbar
     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_name(dtw->hscrollbar, "HorizontalScrollbar");
     gtk_grid_attach(GTK_GRID(dtw->canvas_tbl), dtw->hscrollbar, 1, 2, 1, 1);
     dtw->vscrollbar_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-#else
-    dtw->hscrollbar = gtk_hscrollbar_new (GTK_ADJUSTMENT (dtw->hadj));
-    gtk_table_attach(GTK_TABLE (dtw->canvas_tbl), dtw->hscrollbar, 1, 2, 2, 3,
-            GTK_FILL, GTK_SHRINK,
-            0, 0);
-    dtw->vscrollbar_box = gtk_vbox_new (FALSE, 0);
-#endif
 
     // Sticky zoom button
     dtw->sticky_zoom = sp_button_new_from_data ( Inkscape::ICON_SIZE_DECORATION,
@@ -504,23 +444,10 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
 
     // Vertical scrollbar
     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));
     gtk_widget_set_name(dtw->vscrollbar, "VerticalScrollbar");
-#else
-    dtw->vscrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (dtw->vadj));
-#endif
-
     gtk_box_pack_start (GTK_BOX (dtw->vscrollbar_box), dtw->vscrollbar, TRUE, TRUE, 0);
-
-#if GTK_CHECK_VERSION(3,0,0)
     gtk_grid_attach(GTK_GRID(dtw->canvas_tbl), dtw->vscrollbar_box, 2, 0, 1, 2);
-#else
-    gtk_table_attach(GTK_TABLE(dtw->canvas_tbl), dtw->vscrollbar_box, 2, 3, 0, 2,
-            GTK_SHRINK, GTK_FILL,
-            0, 0);
-#endif
 
     gchar const* tip = "";
     Inkscape::Verb* verb = Inkscape::Verb::get( SP_VERB_VIEW_CMS_TOGGLE );
@@ -554,15 +481,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     cms_adjust_set_sensitive(dtw, FALSE);
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 
-#if GTK_CHECK_VERSION(3,0,0)
     gtk_grid_attach( GTK_GRID(dtw->canvas_tbl), dtw->cms_adjust, 2, 2, 1, 1);
-#else
-    gtk_table_attach( GTK_TABLE(dtw->canvas_tbl), dtw->cms_adjust, 2, 3, 2, 3,
-            (GtkAttachOptions)(GTK_SHRINK),
-            (GtkAttachOptions)(GTK_SHRINK),
-            0, 0);
-#endif
-
     {
         if (!watcher) {
             watcher = new CMSPrefWatcher();
@@ -579,10 +498,8 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
 
     sp_ruler_add_track_widget (SP_RULER(dtw->hruler), GTK_WIDGET(dtw->canvas));
     sp_ruler_add_track_widget (SP_RULER(dtw->vruler), GTK_WIDGET(dtw->canvas));
-
-#if GTK_CHECK_VERSION(3,0,0)
-    GtkCssProvider  *css_provider  = gtk_css_provider_new();
-    GtkStyleContext *style_context = gtk_widget_get_style_context(GTK_WIDGET(dtw->canvas));
+    auto css_provider  = gtk_css_provider_new();
+    auto style_context = gtk_widget_get_style_context(GTK_WIDGET(dtw->canvas));
 
     gtk_css_provider_load_from_data(css_provider,
                                     "SPCanvas {\n"
@@ -593,21 +510,11 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     gtk_style_context_add_provider(style_context,
                                    GTK_STYLE_PROVIDER(css_provider),
                                    GTK_STYLE_PROVIDER_PRIORITY_USER);
-#else
-    GtkStyle *style = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(dtw->canvas)));
-    style->bg[GTK_STATE_NORMAL] = style->white;
-    gtk_widget_set_style (GTK_WIDGET (dtw->canvas), style);
-#endif
-
     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_hexpand(GTK_WIDGET(dtw->canvas), TRUE);
     gtk_widget_set_vexpand(GTK_WIDGET(dtw->canvas), TRUE);
     gtk_grid_attach(GTK_GRID(dtw->canvas_tbl), GTK_WIDGET(dtw->canvas), 1, 1, 1, 1);
-#else
-    gtk_table_attach (GTK_TABLE (dtw->canvas_tbl), GTK_WIDGET(dtw->canvas), 1, 2, 1, 2, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), 0, 0);
-#endif
 
     /* Dock */
     bool create_dock =
@@ -616,12 +523,8 @@ 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();
+        auto paned = new Gtk::Paned();
         paned->set_name("Canvas_and_Dock");
-#else
-        Gtk::HPaned *paned = new Gtk::HPaned();
-#endif
 
         paned->pack1(*Glib::wrap(dtw->canvas_tbl));
         paned->pack2(dtw->dock->getWidget(), Gtk::FILL);
@@ -632,24 +535,13 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
             paned_class->cycle_handle_focus = NULL;
         }
 
-#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_grid_attach(GTK_GRID(tbl_wrapper), GTK_WIDGET (paned->gobj()), 1, 1, 1, 1);
-#else
-        gtk_table_attach (GTK_TABLE (tbl_wrapper), GTK_WIDGET (paned->gobj()), 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
-                          (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 0, 0);
-#endif
-
     } else {
-#if GTK_CHECK_VERSION(3,0,0)
         gtk_widget_set_hexpand(GTK_WIDGET(dtw->canvas_tbl), TRUE);
         gtk_widget_set_vexpand(GTK_WIDGET(dtw->canvas_tbl), TRUE);
         gtk_grid_attach(GTK_GRID(tbl_wrapper), GTK_WIDGET (dtw->canvas_tbl), 1, 1, 1, 1);
-#else
-        gtk_table_attach (GTK_TABLE (tbl_wrapper), GTK_WIDGET (dtw->canvas_tbl), 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
-                          (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 0, 0);
-#endif
     }
 
     // connect scrollbar signals
@@ -666,11 +558,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
 
     // Separator
     gtk_box_pack_start(GTK_BOX(dtw->statusbar), 
-#if GTK_CHECK_VERSION(3,0,0)
 		    gtk_separator_new(GTK_ORIENTATION_VERTICAL), 
-#else
-		    gtk_vseparator_new(), 
-#endif
 		    FALSE, FALSE, 0);
 
     // Layer Selector
@@ -689,12 +577,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     gtk_label_set_lines (GTK_LABEL(dtw->select_status), 2);
 #endif
 
-#if GTK_CHECK_VERSION(3,0,0)
     gtk_widget_set_halign(dtw->select_status, GTK_ALIGN_START);
-#else
-    gtk_misc_set_alignment (GTK_MISC (dtw->select_status), 0.0, 0.5);
-#endif
-
     gtk_widget_set_size_request (dtw->select_status, 1, -1);
 
     // Display the initial welcome message in the statusbar
@@ -720,65 +603,36 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     dtw->zoom_update = g_signal_connect (G_OBJECT (dtw->zoom_status), "populate_popup", G_CALLBACK (sp_dtw_zoom_populate_popup), dtw);
 
     // Cursor coordinates
-#if GTK_CHECK_VERSION(3,0,0)
     dtw->coord_status = gtk_grid_new();
     gtk_widget_set_name(dtw->coord_status, "CoordinateAndZStatus");
     gtk_grid_set_row_spacing(GTK_GRID(dtw->coord_status), 0);
     gtk_grid_set_column_spacing(GTK_GRID(dtw->coord_status), 2);
-    GtkWidget* sep = gtk_separator_new(GTK_ORIENTATION_VERTICAL);
+    auto sep = gtk_separator_new(GTK_ORIENTATION_VERTICAL);
     gtk_widget_set_name(sep, "CoordinateSeparator");
     gtk_grid_attach(GTK_GRID(dtw->coord_status), 
 		    GTK_WIDGET(sep),
 		    0, 0, 1, 2);
-#else
-    dtw->coord_status = gtk_table_new(5, 2, FALSE);
-    gtk_table_set_row_spacings(GTK_TABLE(dtw->coord_status), 0);
-    gtk_table_set_col_spacings(GTK_TABLE(dtw->coord_status), 2);
-    gtk_table_attach(GTK_TABLE(dtw->coord_status), 
-		    gtk_vseparator_new(), 
-		    0, 1, 0, 2,
-                    GTK_FILL, GTK_FILL, 0, 0);
-#endif
 
     gtk_widget_set_tooltip_text (dtw->coord_status, _("Cursor coordinates"));
-    GtkWidget *label_x = gtk_label_new(_("X:"));
-    GtkWidget *label_y = gtk_label_new(_("Y:"));
-
-#if GTK_CHECK_VERSION(3,0,0)
+    auto label_x = gtk_label_new(_("X:"));
+    auto label_y = gtk_label_new(_("Y:"));
     gtk_widget_set_halign(label_x, GTK_ALIGN_START);
     gtk_widget_set_halign(label_y, GTK_ALIGN_START);
     gtk_grid_attach(GTK_GRID(dtw->coord_status), label_x, 1, 0, 1, 1);
     gtk_grid_attach(GTK_GRID(dtw->coord_status), label_y, 1, 1, 1, 1);
-#else
-    gtk_misc_set_alignment (GTK_MISC(label_x), 0.0, 0.5);
-    gtk_misc_set_alignment (GTK_MISC(label_y), 0.0, 0.5);
-    gtk_table_attach(GTK_TABLE(dtw->coord_status),  label_x, 1,2, 0,1, GTK_FILL, GTK_FILL, 0, 0);
-    gtk_table_attach(GTK_TABLE(dtw->coord_status),  label_y, 1,2, 1,2, GTK_FILL, GTK_FILL, 0, 0);
-#endif
-
     dtw->coord_status_x = gtk_label_new(NULL);
     dtw->coord_status_y = gtk_label_new(NULL);
     gtk_label_set_markup( GTK_LABEL(dtw->coord_status_x), "<tt>   0.00 </tt>" );
     gtk_label_set_markup( GTK_LABEL(dtw->coord_status_y), "<tt>   0.00 </tt>" );
 
-    GtkWidget* label_z = gtk_label_new(_("Z:"));
+    auto label_z = gtk_label_new(_("Z:"));
     gtk_widget_set_name(label_z, "ZLabel");
-
-#if GTK_CHECK_VERSION(3,0,0)
     gtk_widget_set_halign(dtw->coord_status_x, GTK_ALIGN_END);
     gtk_widget_set_halign(dtw->coord_status_y, GTK_ALIGN_END);
     gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->coord_status_x, 2, 0, 1, 1);
     gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->coord_status_y, 2, 1, 1, 1);
     gtk_grid_attach(GTK_GRID(dtw->coord_status), label_z, 3, 0, 1, 2);
     gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->zoom_status, 4, 0, 1, 2);
-#else
-    gtk_misc_set_alignment (GTK_MISC(dtw->coord_status_x), 1.0, 0.5);
-    gtk_misc_set_alignment (GTK_MISC(dtw->coord_status_y), 1.0, 0.5);
-    gtk_table_attach(GTK_TABLE(dtw->coord_status), dtw->coord_status_x, 2,3, 0,1, GTK_FILL, GTK_FILL, 0, 0);
-    gtk_table_attach(GTK_TABLE(dtw->coord_status), dtw->coord_status_y, 2,3, 1,2, GTK_FILL, GTK_FILL, 0, 0);
-    gtk_table_attach(GTK_TABLE(dtw->coord_status),  label_z, 3,4, 0,2, GTK_FILL, GTK_FILL, 0, 0);
-    gtk_table_attach(GTK_TABLE(dtw->coord_status),  dtw->zoom_status, 4,5, 0,2, GTK_FILL, GTK_FILL, 0, 0);
-#endif
 
     sp_set_font_size_smaller (dtw->coord_status);
 
diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index fb7eb1420..2e782cf16 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -17,12 +17,7 @@
 #include <glibmm/i18n.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/label.h>
-
-#if WITH_GTKMM_3_0
-# include <gtkmm/grid.h>
-#else
-# include <gtkmm/table.h>
-#endif
+#include <gtkmm/grid.h>
 
 #include <sigc++/functors/ptr_fun.h>
 #include <sigc++/adaptors/bind.h>
@@ -156,11 +151,7 @@ void SPAttributeTable::set_object(SPObject *object,
         release_connection  = object->connectRelease (sigc::bind<1>(sigc::ptr_fun(&sp_attribute_table_object_release), this));
 
         // Create table
-#if WITH_GTKMM_3_0
         table = new Gtk::Grid();
-#else
-        table = new Gtk::Table(attributes.size(), 2, false);
-#endif
 
         if (!(parent == NULL))
             gtk_container_add(GTK_CONTAINER(parent), (GtkWidget*)table->gobj());
@@ -171,27 +162,17 @@ void SPAttributeTable::set_object(SPObject *object,
             Gtk::Label *ll = new Gtk::Label (_(labels[i].c_str()));
             ll->show();
             ll->set_alignment (1.0, 0.5);
-
-#if WITH_GTKMM_3_0
             ll->set_vexpand();
             ll->set_margin_left(XPAD);
             ll->set_margin_right(XPAD);
             ll->set_margin_top(XPAD);
             ll->set_margin_bottom(XPAD);
             table->attach(*ll, 0, i, 1, 1);
-#else
-            table->attach (*ll, 0, 1, i, i + 1,
-                               Gtk::FILL,
-                               (Gtk::EXPAND | Gtk::FILL),
-                               XPAD, YPAD );
-#endif
 
             Gtk::Entry *ee = new Gtk::Entry();
             ee->show();
             const gchar *val = object->getRepr()->attribute(attributes[i].c_str());
             ee->set_text (val ? val : (const gchar *) "");
-
-#if WITH_GTKMM_3_0
             ee->set_hexpand();
             ee->set_vexpand();
             ee->set_margin_left(XPAD);
@@ -199,12 +180,6 @@ void SPAttributeTable::set_object(SPObject *object,
             ee->set_margin_top(XPAD);
             ee->set_margin_bottom(XPAD);
             table->attach(*ee, 1, i, 1, 1);
-#else
-            table->attach (*ee, 1, 2, i, i + 1,
-                               (Gtk::EXPAND | Gtk::FILL),
-                               (Gtk::EXPAND | Gtk::FILL),
-                               XPAD, YPAD );
-#endif
 
             _entries.push_back(ee);
             g_signal_connect ( ee->gobj(), "changed",
diff --git a/src/widgets/sp-attribute-widget.h b/src/widgets/sp-attribute-widget.h
index d9b972201..161bb706a 100644
--- a/src/widgets/sp-attribute-widget.h
+++ b/src/widgets/sp-attribute-widget.h
@@ -25,12 +25,7 @@
 
 namespace Gtk {
 class Entry;
-
-#if WITH_GTKMM_3_0
 class Grid;
-#else
-class Table;
-#endif
 }
 
 namespace Inkscape {
@@ -138,11 +133,7 @@ private:
     /**
      * Container widget for the dynamically created child widgets (labels and entry boxes).
      */
-#if WITH_GTKMM_3_0
     Gtk::Grid  *table;
-#else
-    Gtk::Table *table;
-#endif
     
     /**
      * List of attributes.
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 84a6e77ad..990ec8d35 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -155,17 +155,9 @@ StrokeStyle::StrokeStyle() :
     Gtk::HBox *f = new Gtk::HBox(false, 0);
     f->show();
     add(*f);
-
-#if WITH_GTKMM_3_0
     table = new Gtk::Grid();
     table->set_border_width(4);
     table->set_row_spacing(4);
-#else
-    table = new Gtk::Table(3, 6, false);
-    table->set_border_width(4);
-    table->set_row_spacings(4);
-#endif
-    
     table->show();
     f->add(*table);
 
@@ -181,13 +173,7 @@ StrokeStyle::StrokeStyle() :
 // stroke_width_set_unit will be removed (because ScalarUnit takes care of conversions itself), and
 // with it, the two remaining calls of stroke_average_width, allowing us to get rid of that
 // function in desktop-style.
-
-#if WITH_GTKMM_3_0
     widthAdj = new Glib::RefPtr<Gtk::Adjustment>(Gtk::Adjustment::create(1.0, 0.0, 1000.0, 0.1, 10.0, 0.0));
-#else
-    widthAdj = new Gtk::Adjustment(1.0, 0.0, 1000.0, 0.1, 10.0, 0.0);
-#endif
-
     widthSpin = new Inkscape::UI::Widget::SpinButton(*widthAdj, 0.1, 3);
     widthSpin->set_tooltip_text(_("Stroke width"));
     widthSpin->show();
@@ -213,12 +199,7 @@ StrokeStyle::StrokeStyle() :
     us->show();
 
     hb->pack_start(*us, FALSE, FALSE, 0);
-
-#if WITH_GTKMM_3_0
     (*widthAdj)->signal_value_changed().connect(sigc::mem_fun(*this, &StrokeStyle::widthChangedCB));
-#else
-    widthAdj->signal_value_changed().connect(sigc::mem_fun(*this, &StrokeStyle::widthChangedCB));
-#endif
     i++;
 
     /* Dash */
@@ -230,16 +211,10 @@ StrokeStyle::StrokeStyle() :
     dashSelector = Gtk::manage(new SPDashSelector);
 
     dashSelector->show();
-
-#if WITH_GTKMM_3_0
     dashSelector->set_hexpand();
     dashSelector->set_halign(Gtk::ALIGN_FILL);
     dashSelector->set_valign(Gtk::ALIGN_CENTER);
     table->attach(*dashSelector, 1, i, 3, 1);
-#else
-    table->attach(*dashSelector, 1, 4, i, i+1, (Gtk::EXPAND | Gtk::FILL), static_cast<Gtk::AttachOptions>(0), 0, 0);
-#endif
-
     dashSelector->changed_signal.connect(sigc::mem_fun(*this, &StrokeStyle::lineDashChangedCB));
 
     i++;
@@ -323,28 +298,14 @@ StrokeStyle::StrokeStyle() :
     //  miter limit is to cut off such spikes (i.e. convert them into bevels)
     //  when they become too long.
     //spw_label(t, _("Miter _limit:"), 0, i);
-
-#if WITH_GTKMM_3_0
     miterLimitAdj = new Glib::RefPtr<Gtk::Adjustment>(Gtk::Adjustment::create(4.0, 0.0, 100.0, 0.1, 10.0, 0.0));
     miterLimitSpin = new Inkscape::UI::Widget::SpinButton(*miterLimitAdj, 0.1, 2);
-#else
-    miterLimitAdj = new Gtk::Adjustment(4.0, 0.0, 100.0, 0.1, 10.0, 0.0);
-    miterLimitSpin = new Inkscape::UI::Widget::SpinButton(*miterLimitAdj, 0.1, 2);
-#endif
-
     miterLimitSpin->set_tooltip_text(_("Maximum length of the miter (in units of stroke width)"));
     miterLimitSpin->show();
     sp_dialog_defocus_on_enter_cpp(miterLimitSpin);
 
     hb->pack_start(*miterLimitSpin, false, false, 0);
-
-#if WITH_GTKMM_3_0
     (*miterLimitAdj)->signal_value_changed().connect(sigc::mem_fun(*this, &StrokeStyle::miterLimitChangedCB));
-
-#else
-    miterLimitAdj->signal_value_changed().connect(sigc::mem_fun(*this, &StrokeStyle::miterLimitChangedCB));
-#endif
-
     i++;
 
     /* Cap type */
@@ -927,17 +888,9 @@ StrokeStyle::updateLine()
 
         if (unit->type == Inkscape::Util::UNIT_TYPE_LINEAR) {
             double avgwidth = Inkscape::Util::Quantity::convert(query.stroke_width.computed, "px", unit);
-#if WITH_GTKMM_3_0
             (*widthAdj)->set_value(avgwidth);
-#else
-            widthAdj->set_value(avgwidth);
-#endif
         } else {
-#if WITH_GTKMM_3_0
             (*widthAdj)->set_value(100);
-#else
-            widthAdj->set_value(100);
-#endif
         }
 
         // if none of the selected objects has a stroke, than quite some controls should be disabled
@@ -958,11 +911,7 @@ StrokeStyle::updateLine()
     }
 
     if (result_ml != QUERY_STYLE_NOTHING)
-#if WITH_GTKMM_3_0
         (*miterLimitAdj)->set_value(query.stroke_miterlimit.value); // TODO: reflect averagedness?
-#else
-        miterLimitAdj->set_value(query.stroke_miterlimit.value); // TODO: reflect averagedness?
-#endif
 
     if (result_join != QUERY_STYLE_MULTIPLE_DIFFERENT &&
         result_join != QUERY_STYLE_NOTHING ) {
@@ -1050,13 +999,8 @@ StrokeStyle::scaleLine()
     SPCSSAttr *css = sp_repr_css_attr_new();
 
     if (!items.empty()) {
-#if WITH_GTKMM_3_0
         double width_typed = (*widthAdj)->get_value();
         double const miterlimit = (*miterLimitAdj)->get_value();
-#else
-        double width_typed = widthAdj->get_value();
-        double const miterlimit = miterLimitAdj->get_value();
-#endif
 
         Inkscape::Util::Unit const *const unit = unitSelector->getUnit();
 
@@ -1096,11 +1040,7 @@ StrokeStyle::scaleLine()
 
         if (unit->type != Inkscape::Util::UNIT_TYPE_LINEAR) {
             // reset to 100 percent
-#if WITH_GTKMM_3_0
             (*widthAdj)->set_value(100.0);
-#else
-            widthAdj->set_value(100.0);
-#endif
         }
 
     }
diff --git a/src/widgets/stroke-style.h b/src/widgets/stroke-style.h
index d83067a4a..76582602d 100644
--- a/src/widgets/stroke-style.h
+++ b/src/widgets/stroke-style.h
@@ -23,12 +23,7 @@
 
 #include "widgets/dash-selector.h"
 #include <gtkmm/radiobutton.h>
-
-#if WITH_GTKMM_3_0
 #include <gtkmm/grid.h>
-#else
-#include <gtkmm/table.h>
-#endif
 
 #include <glibmm/i18n.h>
 
@@ -189,15 +184,9 @@ private:
     MarkerComboBox *startMarkerCombo;
     MarkerComboBox *midMarkerCombo;
     MarkerComboBox *endMarkerCombo;
-#if WITH_GTKMM_3_0
     Gtk::Grid *table;
     Glib::RefPtr<Gtk::Adjustment> *widthAdj;
     Glib::RefPtr<Gtk::Adjustment> *miterLimitAdj;
-#else
-    Gtk::Table *table;
-    Gtk::Adjustment *widthAdj;
-    Gtk::Adjustment *miterLimitAdj;
-#endif
     Inkscape::UI::Widget::SpinButton *miterLimitSpin;
     Inkscape::UI::Widget::SpinButton *widthSpin;
     Inkscape::UI::Widget::UnitMenu *unitSelector;
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 8113c9619..caca0c267 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -1016,26 +1016,18 @@ static GtkWidget* toolboxNewCommon( GtkWidget* tb, BarId id, GtkPositionType /*h
 
 GtkWidget *ToolboxFactory::createToolToolbox()
 {
-#if GTK_CHECK_VERSION(3,0,0)
-    GtkWidget *tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+    auto tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_widget_set_name(tb, "ToolToolbox");
     gtk_box_set_homogeneous(GTK_BOX(tb), FALSE);
-#else
-    GtkWidget *tb = gtk_vbox_new(FALSE, 0);
-#endif
 
     return toolboxNewCommon( tb, BAR_TOOL, GTK_POS_TOP );
 }
 
 GtkWidget *ToolboxFactory::createAuxToolbox()
 {
-#if GTK_CHECK_VERSION(3,0,0)
-    GtkWidget *tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+    auto tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_widget_set_name(tb, "AuxToolbox");
     gtk_box_set_homogeneous(GTK_BOX(tb), FALSE);
-#else
-    GtkWidget *tb = gtk_vbox_new(FALSE, 0);
-#endif
 
     return toolboxNewCommon( tb, BAR_AUX, GTK_POS_LEFT );
 }
@@ -1046,38 +1038,26 @@ GtkWidget *ToolboxFactory::createAuxToolbox()
 
 GtkWidget *ToolboxFactory::createCommandsToolbox()
 {
-#if GTK_CHECK_VERSION(3,0,0)
-    GtkWidget *tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+    auto tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_widget_set_name(tb, "CommandsToolbox");
     gtk_box_set_homogeneous(GTK_BOX(tb), FALSE);
-#else
-    GtkWidget *tb = gtk_vbox_new(FALSE, 0);
-#endif
 
     return toolboxNewCommon( tb, BAR_COMMANDS, GTK_POS_LEFT );
 }
 
 GtkWidget *ToolboxFactory::createSnapToolbox()
 {
-#if GTK_CHECK_VERSION(3,0,0)
-    GtkWidget *tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+    auto tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_widget_set_name(tb, "SnapToolbox");
     gtk_box_set_homogeneous(GTK_BOX(tb), FALSE);
-#else
-    GtkWidget *tb = gtk_vbox_new(FALSE, 0);
-#endif
 
     return toolboxNewCommon( tb, BAR_SNAP, GTK_POS_LEFT );
 }
 
 static GtkWidget* createCustomSlider( GtkAdjustment *adjustment, gdouble climbRate, guint digits, Inkscape::UI::Widget::UnitTracker *unit_tracker)
 {
-#if WITH_GTKMM_3_0
-    Glib::RefPtr<Gtk::Adjustment> adj = Glib::wrap(adjustment, true);
-    Inkscape::UI::Widget::SpinButton *inkSpinner = new Inkscape::UI::Widget::SpinButton(adj, climbRate, digits);
-#else
-    Inkscape::UI::Widget::SpinButton *inkSpinner = new Inkscape::UI::Widget::SpinButton(*Glib::wrap(adjustment, true), climbRate, digits);
-#endif
+    auto adj = Glib::wrap(adjustment, true);
+    auto inkSpinner = new Inkscape::UI::Widget::SpinButton(adj, climbRate, digits);
     inkSpinner->addUnitTracker(unit_tracker);
     inkSpinner = Gtk::manage( inkSpinner );
     GtkWidget *widget = GTK_WIDGET( inkSpinner->gobj() );
@@ -1439,17 +1419,10 @@ void setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
         if ( aux_toolboxes[i].prep_func ) {
             // converted to GtkActions and UIManager
 
-            GtkWidget* kludge = dataHolders[aux_toolboxes[i].type_name];
-
-#if GTK_CHECK_VERSION(3,0,0)
-            GtkWidget* holder = gtk_grid_new();
+            auto kludge = dataHolders[aux_toolboxes[i].type_name];
+            auto holder = gtk_grid_new();
             gtk_widget_set_name( holder, "ToolbarHolder" );
             gtk_grid_attach( GTK_GRID(holder), kludge, 2, 0, 1, 1);
-#else
-            GtkWidget* holder = gtk_table_new( 1, 3, FALSE );
-            gtk_table_attach( GTK_TABLE(holder), kludge, 2, 3, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0 );
-#endif
-
             gchar* tmp = g_strdup_printf( "/ui/%s", aux_toolboxes[i].ui_name );
             GtkWidget* toolBar = gtk_ui_manager_get_widget( mgr, tmp );
             g_free( tmp );
@@ -1461,30 +1434,20 @@ void setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
 
             Inkscape::IconSize toolboxSize = ToolboxFactory::prefToSize("/toolbox/small");
             gtk_toolbar_set_icon_size( GTK_TOOLBAR(toolBar), static_cast<GtkIconSize>(toolboxSize) );
-
-#if GTK_CHECK_VERSION(3,0,0)
             gtk_widget_set_hexpand(toolBar, TRUE);
             gtk_grid_attach( GTK_GRID(holder), toolBar, 0, 0, 1, 1);
-#else
-            gtk_table_attach( GTK_TABLE(holder), toolBar, 0, 1, 0, 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 0, 0 );
-#endif
 
             if ( aux_toolboxes[i].swatch_verb_id != SP_VERB_INVALID ) {
                 Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch( NULL, _(aux_toolboxes[i].swatch_tip) );
                 swatch->setDesktop( desktop );
                 swatch->setClickVerb( aux_toolboxes[i].swatch_verb_id );
                 swatch->setWatchedTool( aux_toolboxes[i].swatch_tool, true );
-                GtkWidget *swatch_ = GTK_WIDGET( swatch->gobj() );
-
-#if GTK_CHECK_VERSION(3,0,0)
+                auto swatch_ = GTK_WIDGET( swatch->gobj() );
                 gtk_widget_set_margin_left(swatch_, AUX_BETWEEN_BUTTON_GROUPS);
                 gtk_widget_set_margin_right(swatch_, AUX_BETWEEN_BUTTON_GROUPS);
                 gtk_widget_set_margin_top(swatch_, AUX_SPACING);
                 gtk_widget_set_margin_bottom(swatch_, AUX_SPACING);
                 gtk_grid_attach( GTK_GRID(holder), swatch_, 1, 0, 1, 1);
-#else
-                gtk_table_attach( GTK_TABLE(holder), swatch_, 1, 2, 0, 1, (GtkAttachOptions)(GTK_SHRINK | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), AUX_BETWEEN_BUTTON_GROUPS, AUX_SPACING );
-#endif
             }
             if(i==0){
                 gtk_widget_show_all( holder );