Drop GTK+ 2.20 support.

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

(bzr r11529)

4 files changed, 2 insertions, 27 deletions

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 {