Drop GTK+ 2.20 support.

Fixed bugs:
  - https://launchpad.net/bugs/1020494

(bzr r11529)

21 files changed, 5 insertions, 178 deletions

diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp
index 885846685..5a99ce4bc 100644
--- a/src/ui/dialog/aboutbox.cpp
+++ b/src/ui/dialog/aboutbox.cpp
@@ -108,11 +108,7 @@ AboutBox::AboutBox() : Gtk::Dialog(_("About Inkscape")) {
         g_strdup_printf("<small>Inkscape %s</small>",
               Inkscape::version_string);
     label->set_markup(label_text);
-#if WITH_GTKMM_2_22
     label->set_alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
-#else
-    label->set_alignment(Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
-#endif
     label->set_padding(5,0);
     g_free(label_text);
     label->set_selectable(true);
diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp
index 8d8a8fabd..b0da4aecc 100644
--- a/src/ui/dialog/color-item.cpp
+++ b/src/ui/dialog/color-item.cpp
@@ -551,11 +551,7 @@ Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, ::PreviewS
     Gtk::Widget* widget = 0;
     if ( style == PREVIEW_STYLE_BLURB) {
         Gtk::Label *lbl = new Gtk::Label(def.descr);
-#if WITH_GTKMM_2_22
         lbl->set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
-#else
-        lbl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
-#endif
         widget = lbl;
     } else {
 //         Glib::ustring blank("          ");
diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index afb242199..f5f712103 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -34,10 +34,6 @@
 
 #include <gtk/gtk.h>
 
-#if !GTK_CHECK_VERSION(2,22,0)
-#include "compat-key-syms.h"
-#endif
-
 #define MIN_ONSCREEN_DISTANCE 50
 
 
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index f1c01954e..0768ec3d9 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -132,18 +132,10 @@ DocumentProperties::DocumentProperties()
       _rcb_perp(_("Snap perpendicularly"), _("When snapping to paths or guides, then also try snapping perpendicularly"), "inkscape:snap-perpendicular", _wr),
       _rcb_tang(_("Snap tangentially"), _("When snapping to paths or guides, then also try snapping tangentially"), "inkscape:snap-tangential", _wr),
     //---------------------------------------------------------------
-#if WITH_GTKMM_2_22
       _grids_label_crea("", Gtk::ALIGN_START),
-#else
-      _grids_label_crea("", Gtk::ALIGN_LEFT),
-#endif
       _grids_button_new(C_("Grid", "_New"), _("Create new grid.")),
       _grids_button_remove(C_("Grid", "_Remove"), _("Remove selected grid.")),
-#if WITH_GTKMM_2_22
       _grids_label_def("", Gtk::ALIGN_START)
-#else
-      _grids_label_def("", Gtk::ALIGN_LEFT)
-#endif
 {
     _getContents()->set_spacing (4);
     _getContents()->pack_start(_notebook, true, true);
@@ -533,18 +525,9 @@ void DocumentProperties::removeSelectedProfile(){
 void DocumentProperties::build_cms()
 {
     _page_cms.show();
-
-#if WITH_GTKMM_2_22
     Gtk::Label *label_link= manage (new Gtk::Label("", Gtk::ALIGN_START));
-#else
-    Gtk::Label *label_link= manage (new Gtk::Label("", Gtk::ALIGN_LEFT));
-#endif
     label_link->set_markup (_("<b>Linked Color Profiles:</b>"));
-#if WITH_GTKMM_2_22
     Gtk::Label *label_avail = manage (new Gtk::Label("", Gtk::ALIGN_START));
-#else
-    Gtk::Label *label_avail = manage (new Gtk::Label("", Gtk::ALIGN_LEFT));
-#endif
     label_avail->set_markup (_("<b>Available Color Profiles:</b>"));
 
     _link_btn.set_label(_("Link Profile"));
@@ -611,12 +594,7 @@ void DocumentProperties::build_scripting()
 
     //# External scripts tab
     _page_external_scripts.show();
-    
-#if WITH_GTKMM_2_22
     Gtk::Label *label_external= manage (new Gtk::Label("", Gtk::ALIGN_START));
-#else
-    Gtk::Label *label_external= manage (new Gtk::Label("", Gtk::ALIGN_LEFT));
-#endif
     label_external->set_markup (_("<b>External script files:</b>"));
 
     _add_btn.set_label(_("Add"));
@@ -649,12 +627,7 @@ void DocumentProperties::build_scripting()
 
     //# Embedded scripts tab
     _page_embedded_scripts.show();
-
-#if WITH_GTKMM_2_22
     Gtk::Label *label_embedded= manage (new Gtk::Label("", Gtk::ALIGN_START));
-#else
-    Gtk::Label *label_embedded= manage (new Gtk::Label("", Gtk::ALIGN_LEFT));
-#endif
     label_embedded->set_markup (_("<b>Embedded script files:</b>"));
 
     _new_btn.set_label(_("New"));
@@ -684,11 +657,7 @@ void DocumentProperties::build_scripting()
 // TODO restore?    _EmbeddedScriptsList.set_fixed_height_mode(true);
 
     //# Set up the Embedded Scripts content box
-#if WITH_GTKMM_2_22
     Gtk::Label *label_embedded_content= manage (new Gtk::Label("", Gtk::ALIGN_START));
-#else
-    Gtk::Label *label_embedded_content= manage (new Gtk::Label("", Gtk::ALIGN_LEFT));
-#endif
     label_embedded_content->set_markup (_("<b>Content:</b>"));
 
     label_embedded_content->set_alignment(0.0);
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 2862c5010..14854afe5 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -163,12 +163,7 @@ Export::Export (void) :
 
     /* Export area frame */
     {
-
-    #if WITH_GTKMM_2_22
         Gtk::Label* lbl = new Gtk::Label(_("<big><b>Export area</b></big>"), Gtk::ALIGN_START);
-    #else
-        Gtk::Label* lbl = new Gtk::Label(_("<big><b>Export area</b></big>"), Gtk::ALIGN_LEFT);
-    #endif
         lbl->set_use_markup(true);
         area_box.pack_start(*lbl);
 
@@ -233,12 +228,7 @@ Export::Export (void) :
     /* Bitmap size frame */
     {
         size_box.set_border_width(3);
-
-#if WITH_GTKMM_2_22
         bm_label = new Gtk::Label(_("<big><b>Bitmap size</b></big>"), Gtk::ALIGN_START);
-#else
-        bm_label = new Gtk::Label(_("<big><b>Bitmap size</b></big>"), Gtk::ALIGN_LEFT);
-#endif
         bm_label->set_use_markup(true);
         size_box.pack_start(*bm_label, false, false, 0);
         Gtk::Table *t = new Gtk::Table(2, 5, false);
@@ -275,12 +265,7 @@ Export::Export (void) :
     /* File entry */
     {
         file_box.set_border_width(3);
-
-#if WITH_GTKMM_2_22
         flabel = new Gtk::Label(_("<big><b>_Filename</b></big>"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, true);
-#else
-        flabel = new Gtk::Label(_("<big><b>_Filename</b></big>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, true);
-#endif
         flabel->set_use_markup(true);
         file_box.pack_start(*flabel, false, false, 0);
 
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 321835569..acdbfba70 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -486,11 +486,7 @@ public:
           _matrix(SP_ATTR_VALUES, _("This matrix determines a linear transform on color space. Each line affects one of the color components. Each column determines how much of each color component from the input is passed to the output. The last column does not depend on input colors, so can be used to adjust a constant component value.")),
           _saturation(0, 0, 1, 0.1, 0.01, 2, SP_ATTR_VALUES),
           _angle(0, 0, 360, 0.1, 0.01, 1, SP_ATTR_VALUES),
-#if WITH_GTKMM_2_22
           _label(_("None"), Gtk::ALIGN_START),
-#else
-          _label(_("None"), Gtk::ALIGN_LEFT),
-#endif
           _use_stored(false),
           _saturation_store(0),
           _angle_store(0)
@@ -930,11 +926,7 @@ private:
 
         if(label != "") {
             //lbl = Gtk::manage(new Gtk::Label(label + (label == "" ? "" : ":"), Gtk::ALIGN_LEFT)); colon now in label (LP #358921)
-#if WITH_GTKMM_2_22
-        	lbl = Gtk::manage(new Gtk::Label(label, Gtk::ALIGN_START));
-#else
-        	lbl = Gtk::manage(new Gtk::Label(label, Gtk::ALIGN_LEFT));
-#endif
+            lbl = Gtk::manage(new Gtk::Label(label, Gtk::ALIGN_START));
             hb->pack_start(*lbl, false, false);
             _size_group->add_widget(*lbl);
             lbl->show();
@@ -962,11 +954,7 @@ public:
         : AttrWidget(SP_ATTR_INVALID),
           _dialog(d),
           _settings(d, _box, sigc::mem_fun(_dialog, &FilterEffectsDialog::set_child_attr_direct), LIGHT_ENDSOURCE),
-#if WITH_GTKMM_2_22
           _light_label(_("Light Source:"), Gtk::ALIGN_START),
-#else
-          _light_label(_("Light Source:"), Gtk::ALIGN_LEFT),
-#endif
           _light_source(LightSourceConverter),
           _locked(false)
     {
@@ -2241,13 +2229,8 @@ FilterEffectsDialog::FilterEffectsDialog()
     : UI::Widget::Panel("", "/dialogs/filtereffects", SP_VERB_DIALOG_FILTER_EFFECTS),
       _add_primitive_type(FPConverter),
       _add_primitive(_("Add Effect:")),
-#if WITH_GTKMM_2_22
-	_empty_settings(_("No effect selected"), Gtk::ALIGN_START),
-	_no_filter_selected(_("No filter selected"), Gtk::ALIGN_START),
-#else
-  	_empty_settings(_("No effect selected"), Gtk::ALIGN_LEFT),
-	_no_filter_selected(_("No filter selected"), Gtk::ALIGN_LEFT),
-#endif
+      _empty_settings(_("No effect selected"), Gtk::ALIGN_START),
+      _no_filter_selected(_("No filter selected"), Gtk::ALIGN_START),
       _settings_initialized(false),
       _locked(false),
       _attr_lock(false),
diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp
index e220fe92c..1eed8d804 100644
--- a/src/ui/dialog/glyphs.cpp
+++ b/src/ui/dialog/glyphs.cpp
@@ -374,12 +374,7 @@ GlyphsPanel::GlyphsPanel(gchar const *prefsPath) :
         scriptCombo->set_active_text(getScriptToName()[G_UNICODE_SCRIPT_INVALID_CODE]);
         sigc::connection conn = scriptCombo->signal_changed().connect(sigc::mem_fun(*this, &GlyphsPanel::rebuild));
         instanceConns.push_back(conn);
-
-#if WITH_GTKMM_2_22
         Gtk::Alignment *align = new Gtk::Alignment(Gtk::ALIGN_START, Gtk::ALIGN_START, 0.0, 0.0);
-#else
-        Gtk::Alignment *align = new Gtk::Alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_TOP, 0.0, 0.0);
-#endif
         align->add(*Gtk::manage(scriptCombo));
         table->attach( *Gtk::manage(align),
                        1, 2, row, row + 1,
@@ -408,12 +403,7 @@ GlyphsPanel::GlyphsPanel(gchar const *prefsPath) :
         rangeCombo->set_active_text(getRanges()[1].second);
         sigc::connection conn = rangeCombo->signal_changed().connect(sigc::mem_fun(*this, &GlyphsPanel::rebuild));
         instanceConns.push_back(conn);
-
-#if WITH_GTKMM_2_22
         Gtk::Alignment *align = new Gtk::Alignment(Gtk::ALIGN_START, Gtk::ALIGN_START, 0.0, 0.0);
-#else
-        Gtk::Alignment *align = new Gtk::Alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_TOP, 0.0, 0.0);
-#endif
         align->add(*Gtk::manage(rangeCombo));
         table->attach( *Gtk::manage(align),
                        1, 2, row, row + 1,
diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp
index a35690f59..b3c1bddfd 100644
--- a/src/ui/dialog/input.cpp
+++ b/src/ui/dialog/input.cpp
@@ -964,11 +964,7 @@ InputDialogImpl::ConfPanel::ConfPanel() :
     pack_start(useExt, Gtk::PACK_SHRINK);
 
     save.signal_clicked().connect(sigc::mem_fun(*this, &InputDialogImpl::ConfPanel::saveSettings));
-#if WITH_GTKMM_2_22
     Gtk::Alignment *align = new Gtk::Alignment(Gtk::ALIGN_END, Gtk::ALIGN_START, 0, 0);
-#else
-    Gtk::Alignment *align = new Gtk::Alignment(Gtk::ALIGN_RIGHT, Gtk::ALIGN_TOP, 0, 0);
-#endif
     align->add(save);
     pack_start(*Gtk::manage(align), Gtk::PACK_SHRINK);
 }
@@ -1454,11 +1450,7 @@ void InputDialogImpl::updateTestAxes( Glib::ustring const& key, GdkDevice* dev )
 
 void InputDialogImpl::mapAxesValues( Glib::ustring const& key, gdouble const * axes, GdkDevice* dev )
 {
-#if GTK_CHECK_VERSION(2,22,0)
     guint numAxes = gdk_device_get_n_axes(dev);
-#else
-    guint numAxes = dev->num_axes;
-#endif
 
     static gdouble epsilon = 0.0001;
     if ( (numAxes > 0) && axes) {
@@ -1511,13 +1503,8 @@ Glib::ustring InputDialogImpl::getKeyFor( GdkDevice* device )
 {
     Glib::ustring key;
 
-#if GTK_CHECK_VERSION(2,22,0)
     GdkInputSource source = gdk_device_get_source(device);
     const gchar *name = gdk_device_get_name(device);
-#else
-    GdkInputSource source = device->source;
-    const gchar *name = device->name;
-#endif
 
     switch ( source ) {
         case GDK_SOURCE_MOUSE:
@@ -1568,13 +1555,8 @@ bool InputDialogImpl::eventSnoop(GdkEvent* event)
             GdkEventButton* btnEvt = reinterpret_cast<GdkEventButton*>(event);
             if ( btnEvt->device ) {
                 key = getKeyFor(btnEvt->device);
-#if GTK_CHECK_VERSION(2,22,0)
 		source = gdk_device_get_source(btnEvt->device);
 		devName = gdk_device_get_name(btnEvt->device);
-#else
-                source = btnEvt->device->source;
-                devName = btnEvt->device->name;
-#endif
                 mapAxesValues(key, btnEvt->axes, btnEvt->device);
 
                 if ( buttonMap[key].find(btnEvt->button) == buttonMap[key].end() ) {
@@ -1602,13 +1584,8 @@ bool InputDialogImpl::eventSnoop(GdkEvent* event)
             GdkEventMotion* btnMtn = reinterpret_cast<GdkEventMotion*>(event);
             if ( btnMtn->device ) {
                 key = getKeyFor(btnMtn->device);
-#if GTK_CHECK_VERSION(2,22,0)
 		source = gdk_device_get_source(btnMtn->device);
 		devName = gdk_device_get_name(btnMtn->device);
-#else
-                source = btnMtn->device->source;
-                devName = btnMtn->device->name;
-#endif
                 mapAxesValues(key, btnMtn->axes, btnMtn->device);
             }
             gchar* name = gtk_accelerator_name(0, static_cast<GdkModifierType>(btnMtn->state));
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index a54e04407..accf03586 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -48,10 +48,6 @@
 #include "widgets/sp-xmlview-content.h"
 #include "widgets/sp-xmlview-tree.h"
 
-#if !GTK_CHECK_VERSION(2,22,0)
-#include "compat-key-syms.h"
-#endif
-
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/tool/control-point-selection.cpp b/src/ui/tool/control-point-selection.cpp
index 58db09b56..1c42c5d90 100644
--- a/src/ui/tool/control-point-selection.cpp
+++ b/src/ui/tool/control-point-selection.cpp
@@ -21,10 +21,6 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#if !GTK_CHECK_VERSION(2,22,0)
-#include "compat-key-syms.h"
-#endif
-
 namespace Inkscape {
 namespace UI {
 
diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index e1ee71d53..fbc9858cc 100644
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -24,10 +24,6 @@
 #include "ui/tool/event-utils.h"
 #include "ui/tool/transform-handle-set.h"
 
-#if !GTK_CHECK_VERSION(2,22,0)
-#include "compat-key-syms.h"
-#endif
-
 namespace Inkscape {
 namespace UI {
 
diff --git a/src/ui/tool/event-utils.cpp b/src/ui/tool/event-utils.cpp
index 6b067a3ce..c3b69d79d 100644
--- a/src/ui/tool/event-utils.cpp
+++ b/src/ui/tool/event-utils.cpp
@@ -14,10 +14,6 @@
 #include "display/sp-canvas.h"
 #include "ui/tool/event-utils.h"
 
-#if !GTK_CHECK_VERSION(2,22,0)
-#include "compat-key-syms.h"
-#endif
-
 namespace Inkscape {
 namespace UI {
 
@@ -80,11 +76,7 @@ unsigned combine_motion_events(SPCanvas *canvas, GdkEventMotion &event, gint mas
             event.x_root = next.x_root;
             event.y_root = next.y_root;
             if (event.axes && next.axes) {
-#if GTK_CHECK_VERSION(2,22,0)
                 memcpy(event.axes, next.axes, gdk_device_get_n_axes(event.device));
-#else
-                memcpy(event.axes, next.axes, event.device->num_axes);
-#endif
             }
         }
 
diff --git a/src/ui/tool/modifier-tracker.cpp b/src/ui/tool/modifier-tracker.cpp
index 601c8334f..cc4e4d0b2 100644
--- a/src/ui/tool/modifier-tracker.cpp
+++ b/src/ui/tool/modifier-tracker.cpp
@@ -14,10 +14,6 @@
 #include "ui/tool/modifier-tracker.h"
 #include <gtk/gtk.h>
 
-#if !GTK_CHECK_VERSION(2,22,0)
-#include "compat-key-syms.h"
-#endif
-
 namespace Inkscape {
 namespace UI {
 
diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp
index 8f3f03aae..eca90f40f 100644
--- a/src/ui/tool/multi-path-manipulator.cpp
+++ b/src/ui/tool/multi-path-manipulator.cpp
@@ -31,10 +31,6 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#if !GTK_CHECK_VERSION(2,22,0)
-#include "compat-key-syms.h"
-#endif
-
 #ifdef USE_GNU_HASHES
 namespace __gnu_cxx {
 template<>
diff --git a/src/ui/tool/node-tool.cpp b/src/ui/tool/node-tool.cpp
index 8dfee6e65..71c0d3b26 100644
--- a/src/ui/tool/node-tool.cpp
+++ b/src/ui/tool/node-tool.cpp
@@ -44,10 +44,6 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#if !GTK_CHECK_VERSION(2,22,0)
-#include "compat-key-syms.h"
-#endif
-
 /** @struct InkNodeTool
  *
  * Node tool event context.
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 136309a8e..bda410856 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -31,10 +31,6 @@
 #include "ui/tool/path-manipulator.h"
 #include <gdk/gdkkeysyms.h>
 
-#if !GTK_CHECK_VERSION(2,22,0)
-#include "compat-key-syms.h"
-#endif
-
 namespace {
 
 Inkscape::ControlType nodeTypeToCtrlType(Inkscape::UI::NodeType type)
diff --git a/src/ui/tool/selector.cpp b/src/ui/tool/selector.cpp
index 4a414e4ea..2b3ba837c 100644
--- a/src/ui/tool/selector.cpp
+++ b/src/ui/tool/selector.cpp
@@ -20,10 +20,6 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#if !GTK_CHECK_VERSION(2,22,0)
-#include "compat-key-syms.h"
-#endif
-
 namespace Inkscape {
 namespace UI {
 
diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp
index 81fe78f2e..8d6bcf60f 100644
--- a/src/ui/widget/filter-effect-chooser.cpp
+++ b/src/ui/widget/filter-effect-chooser.cpp
@@ -38,11 +38,7 @@ SimpleFilterModifier::SimpleFilterModifier(int flags)
     }
     if (flags & BLUR) {
         add(_hb_blur);
-        #if WITH_GTKMM_2_22
-            _lb_blur.set_alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
-        #else
-            _lb_blur.set_alignment(Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
-        #endif
+        _lb_blur.set_alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
         _hb_blur.pack_start(_lb_blur, false, false, 0);
         _hb_blur.pack_start(_blur, true, true, 0);
         _hb_blur.pack_start(_lb_blur_unit, false, false, 3);
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 9e4e32229..09fe53b31 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -86,12 +86,7 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co
 
     // Opacity
     pack_start(_opacity_vbox, false, false, 2);
-#if WITH_GTKMM_2_22
     _opacity_label.set_alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
-#else
-    _opacity_label.set_alignment(Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
-#endif
-
     _opacity_hbox.pack_start(_opacity_label, false, false, 3);
     //_opacity_vbox.pack_start(_opacity_label_box, false, false, 0);
     _opacity_vbox.pack_start(_opacity_hbox, false, false, 0);
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index a7b51d535..8ce7c63db 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -73,11 +73,7 @@ void DialogPage::add_line(bool indent, Glib::ustring const &label, Gtk::Widget &
     if (label != "")
     {
         Gtk::Label* label_widget;
-#if WITH_GTKMM_2_22
         label_widget = Gtk::manage(new Gtk::Label(label , Gtk::ALIGN_START , Gtk::ALIGN_CENTER, true));
-#else
-        label_widget = Gtk::manage(new Gtk::Label(label , Gtk::ALIGN_LEFT , Gtk::ALIGN_CENTER, true));
-#endif
         label_widget->set_mnemonic_widget(widget);
         if (indent)
         {
@@ -107,11 +103,7 @@ void DialogPage::add_line(bool indent, Glib::ustring const &label, Gtk::Widget &
 
     if (suffix != "")
     {
-#if WITH_GTKMM_2_22
         Gtk::Label* suffix_widget = Gtk::manage(new Gtk::Label(suffix , Gtk::ALIGN_START , Gtk::ALIGN_CENTER, true));
-#else
-        Gtk::Label* suffix_widget = Gtk::manage(new Gtk::Label(suffix , Gtk::ALIGN_LEFT , Gtk::ALIGN_CENTER, true));
-#endif
         if (expand_widget)
             this->attach(*suffix_widget, 2, 3, row, row + 1, Gtk::FILL,  Gtk::AttachOptions(), 0, 0);
         else
@@ -130,13 +122,9 @@ void DialogPage::add_group_header(Glib::ustring name)
     int row = this->property_n_rows();
     if (name != "")
     {
-#if WITH_GTKMM_2_22
         Gtk::Label* label_widget = Gtk::manage(new Gtk::Label(Glib::ustring(/*"<span size='large'>*/"<b>") + name +
                                                Glib::ustring("</b>"/*</span>"*/) , Gtk::ALIGN_START , Gtk::ALIGN_CENTER, true));
-#else
-        Gtk::Label* label_widget = Gtk::manage(new Gtk::Label(Glib::ustring(/*"<span size='large'>*/"<b>") + name +
-                                               Glib::ustring("</b>"/*</span>"*/) , Gtk::ALIGN_LEFT , Gtk::ALIGN_CENTER, true));
-#endif
+        
         label_widget->set_use_markup(true);
         this->attach(*label_widget , 0, 4, row, row + 1, Gtk::FILL, Gtk::AttachOptions(), 0, 0);
         if (row != 1)
diff --git a/src/ui/widget/spinbutton.cpp b/src/ui/widget/spinbutton.cpp
index 7d6479923..c107979a8 100644
--- a/src/ui/widget/spinbutton.cpp
+++ b/src/ui/widget/spinbutton.cpp
@@ -17,10 +17,6 @@
 #include "util/expression-evaluator.h"
 #include "event-context.h"
 
-#if !GTK_CHECK_VERSION(2,22,0)
-#include "compat-key-syms.h"
-#endif
-
 namespace Inkscape {
 namespace UI {
 namespace Widget {