Drop GTK+ 2.20 support.

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

(bzr r11529)

8 files changed, 0 insertions, 36 deletions

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 {