Replace deprecated GDK key symbols

(bzr r11194)

14 files changed, 882 insertions, 279 deletions

diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp
index 3a93df33a..336314c4f 100644
--- a/src/dropper-context.cpp
+++ b/src/dropper-context.cpp
@@ -44,6 +44,14 @@
 #include "message-context.h"
 #include "verbs.h"
 
+#if !GTK_CHECK_VERSION(2,22,0)
+#define GDK_KEY_Up 0xff52
+#define GDK_KEY_Down 0xff54
+#define GDK_KEY_KP_Up 0xff97
+#define GDK_KEY_KP_Down 0xff99
+#define GDK_KEY_Escape 0xff1b
+#endif
+
 using Inkscape::DocumentUndo;
 
 static void sp_dropper_context_class_init(SPDropperContextClass *klass);
@@ -328,16 +336,16 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv
             break;
 	case GDK_KEY_PRESS:
             switch (get_group0_keyval(&event->key)) {
-		case GDK_Up:
-		case GDK_Down:
-		case GDK_KP_Up:
-		case GDK_KP_Down:
+		case GDK_KEY_Up:
+		case GDK_KEY_Down:
+		case GDK_KEY_KP_Up:
+		case GDK_KEY_KP_Down:
                     // prevent the zoom field from activation
                     if (!MOD__CTRL_ONLY) {
                         ret = TRUE;
                     }
                     break;
-		case GDK_Escape:
+		case GDK_KEY_Escape:
                     sp_desktop_selection(desktop)->clear();
 		default:
                     break;
diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp
index f48db0a99..c737b8d29 100644
--- a/src/dyna-draw-context.cpp
+++ b/src/dyna-draw-context.cpp
@@ -81,6 +81,28 @@ using Inkscape::DocumentUndo;
 
 #define DYNA_MIN_WIDTH 1.0e-6
 
+#if !GTK_CHECK_VERSION(2,22,0)
+#define GDK_KEY_Up 0xff52
+#define GDK_KEY_KP_Up 0xff97
+#define GDK_KEY_Down 0xff54
+#define GDK_KEY_KP_Down 0xff99
+#define GDK_KEY_Left 0xff51
+#define GDK_KEY_KP_Left 0xff96
+#define GDK_KEY_Right 0xff53
+#define GDK_KEY_KP_Right 0xff98
+#define GDK_KEY_Home 0xff50
+#define GDK_KEY_KP_Home 0xff95
+#define GDK_KEY_End 0xff57
+#define GDK_KEY_KP_End 0xff9c
+#define GDK_KEY_x 0x078
+#define GDK_KEY_X 0x058
+#define GDK_KEY_z 0x07a
+#define GDK_KEY_Z 0x05a
+#define GDK_KEY_Escape 0xff1b
+#define GDK_KEY_Control_L 0xffe3
+#define GDK_KEY_Control_R 0xffe4
+#endif
+
 static void sp_dyna_draw_context_class_init(SPDynaDrawContextClass *klass);
 static void sp_dyna_draw_context_init(SPDynaDrawContext *ddc);
 static void sp_dyna_draw_context_dispose(GObject *object);
@@ -878,8 +900,8 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
 
     case GDK_KEY_PRESS:
         switch (get_group0_keyval (&event->key)) {
-        case GDK_Up:
-        case GDK_KP_Up:
+        case GDK_KEY_Up:
+        case GDK_KEY_KP_Up:
             if (!MOD__CTRL_ONLY) {
                 dc->angle += 5.0;
                 if (dc->angle > 90.0)
@@ -888,8 +910,8 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
                 ret = TRUE;
             }
             break;
-        case GDK_Down:
-        case GDK_KP_Down:
+        case GDK_KEY_Down:
+        case GDK_KEY_KP_Down:
             if (!MOD__CTRL_ONLY) {
                 dc->angle -= 5.0;
                 if (dc->angle < -90.0)
@@ -898,8 +920,8 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
                 ret = TRUE;
             }
             break;
-        case GDK_Right:
-        case GDK_KP_Right:
+        case GDK_KEY_Right:
+        case GDK_KEY_KP_Right:
             if (!MOD__CTRL_ONLY) {
                 dc->width += 0.01;
                 if (dc->width > 1.0)
@@ -908,8 +930,8 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
                 ret = TRUE;
             }
             break;
-        case GDK_Left:
-        case GDK_KP_Left:
+        case GDK_KEY_Left:
+        case GDK_KEY_KP_Left:
             if (!MOD__CTRL_ONLY) {
                 dc->width -= 0.01;
                 if (dc->width < 0.01)
@@ -918,34 +940,34 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
                 ret = TRUE;
             }
             break;
-        case GDK_Home:
-        case GDK_KP_Home:
+        case GDK_KEY_Home:
+        case GDK_KEY_KP_Home:
             dc->width = 0.01;
             sp_ddc_update_toolbox (desktop, "altx-calligraphy", dc->width * 100);
             ret = TRUE;
             break;
-        case GDK_End:
-        case GDK_KP_End:
+        case GDK_KEY_End:
+        case GDK_KEY_KP_End:
             dc->width = 1.0;
             sp_ddc_update_toolbox (desktop, "altx-calligraphy", dc->width * 100);
             ret = TRUE;
             break;
-        case GDK_x:
-        case GDK_X:
+        case GDK_KEY_x:
+        case GDK_KEY_X:
             if (MOD__ALT_ONLY) {
                 desktop->setToolboxFocusTo ("altx-calligraphy");
                 ret = TRUE;
             }
             break;
-        case GDK_Escape:
+        case GDK_KEY_Escape:
             if (dc->is_drawing) {
                 // if drawing, cancel, otherwise pass it up for deselecting
                 calligraphic_cancel (dc);
                 ret = TRUE;
             }
             break;
-        case GDK_z:
-        case GDK_Z:
+        case GDK_KEY_z:
+        case GDK_KEY_Z:
             if (MOD__CTRL_ONLY && dc->is_drawing) {
                 // if drawing, cancel, otherwise pass it up for undo
                 calligraphic_cancel (dc);
@@ -959,8 +981,8 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
 
     case GDK_KEY_RELEASE:
         switch (get_group0_keyval(&event->key)) {
-            case GDK_Control_L:
-            case GDK_Control_R:
+            case GDK_KEY_Control_L:
+            case GDK_KEY_Control_R:
                 dc->_message_context->clear();
                 dc->hatch_spacing = 0;
                 dc->hatch_spacing_step = 0;
diff --git a/src/eraser-context.cpp b/src/eraser-context.cpp
index 628ad0164..3b309899b 100644
--- a/src/eraser-context.cpp
+++ b/src/eraser-context.cpp
@@ -83,6 +83,28 @@ using Inkscape::DocumentUndo;
 #define DRAG_DEFAULT 1.0
 #define DRAG_MAX 1.0
 
+#if !GTK_CHECK_VERSION(2,22,0)
+#define GDK_KEY_Up 0xff52
+#define GDK_KEY_KP_Up 0xff97
+#define GDK_KEY_Down 0xff54
+#define GDK_KEY_KP_Down 0xff99
+#define GDK_KEY_Left 0xff51
+#define GDK_KEY_KP_Left 0xff96
+#define GDK_KEY_Right 0xff53
+#define GDK_KEY_KP_Right 0xff98
+#define GDK_KEY_Home 0xff50
+#define GDK_KEY_KP_Home 0xff95
+#define GDK_KEY_End 0xff57
+#define GDK_KEY_KP_End 0xff9c
+#define GDK_KEY_x 0x078
+#define GDK_KEY_X 0x058
+#define GDK_KEY_z 0x07a
+#define GDK_KEY_Z 0x05a
+#define GDK_KEY_Escape 0xff1b
+#define GDK_KEY_Control_L 0xffe3
+#define GDK_KEY_Control_R 0xffe4
+#endif
+
 
 static void sp_eraser_context_class_init(SPEraserContextClass *klass);
 static void sp_eraser_context_init(SPEraserContext *erc);
@@ -594,8 +616,8 @@ sp_eraser_context_root_handler(SPEventContext *event_context,
 
     case GDK_KEY_PRESS:
         switch (get_group0_keyval (&event->key)) {
-        case GDK_Up:
-        case GDK_KP_Up:
+        case GDK_KEY_Up:
+        case GDK_KEY_KP_Up:
             if (!MOD__CTRL_ONLY) {
                 dc->angle += 5.0;
                 if (dc->angle > 90.0)
@@ -604,8 +626,8 @@ sp_eraser_context_root_handler(SPEventContext *event_context,
                 ret = TRUE;
             }
             break;
-        case GDK_Down:
-        case GDK_KP_Down:
+        case GDK_KEY_Down:
+        case GDK_KEY_KP_Down:
             if (!MOD__CTRL_ONLY) {
                 dc->angle -= 5.0;
                 if (dc->angle < -90.0)
@@ -614,8 +636,8 @@ sp_eraser_context_root_handler(SPEventContext *event_context,
                 ret = TRUE;
             }
             break;
-        case GDK_Right:
-        case GDK_KP_Right:
+        case GDK_KEY_Right:
+        case GDK_KEY_KP_Right:
             if (!MOD__CTRL_ONLY) {
                 dc->width += 0.01;
                 if (dc->width > 1.0)
@@ -624,8 +646,8 @@ sp_eraser_context_root_handler(SPEventContext *event_context,
                 ret = TRUE;
             }
             break;
-        case GDK_Left:
-        case GDK_KP_Left:
+        case GDK_KEY_Left:
+        case GDK_KEY_KP_Left:
             if (!MOD__CTRL_ONLY) {
                 dc->width -= 0.01;
                 if (dc->width < 0.01)
@@ -634,26 +656,26 @@ sp_eraser_context_root_handler(SPEventContext *event_context,
                 ret = TRUE;
             }
             break;
-        case GDK_Home:
-        case GDK_KP_Home:
+        case GDK_KEY_Home:
+        case GDK_KEY_KP_Home:
             dc->width = 0.01;
             sp_erc_update_toolbox (desktop, "altx-eraser", dc->width * 100);
             ret = TRUE;
             break;
-        case GDK_End:
-        case GDK_KP_End:
+        case GDK_KEY_End:
+        case GDK_KEY_KP_End:
             dc->width = 1.0;
             sp_erc_update_toolbox (desktop, "altx-eraser", dc->width * 100);
             ret = TRUE;
             break;
-        case GDK_x:
-        case GDK_X:
+        case GDK_KEY_x:
+        case GDK_KEY_X:
             if (MOD__ALT_ONLY) {
                 desktop->setToolboxFocusTo ("altx-eraser");
                 ret = TRUE;
             }
             break;
-        case GDK_Escape:
+        case GDK_KEY_Escape:
             Inkscape::Rubberband::get(desktop)->stop();
             if (dc->is_drawing) {
                 // if drawing, cancel, otherwise pass it up for deselecting
@@ -661,8 +683,8 @@ sp_eraser_context_root_handler(SPEventContext *event_context,
                 ret = TRUE;
             }
             break;
-        case GDK_z:
-        case GDK_Z:
+        case GDK_KEY_z:
+        case GDK_KEY_Z:
             if (MOD__CTRL_ONLY && dc->is_drawing) {
                 // if drawing, cancel, otherwise pass it up for undo
                 eraser_cancel (dc);
@@ -676,8 +698,8 @@ sp_eraser_context_root_handler(SPEventContext *event_context,
 
     case GDK_KEY_RELEASE:
         switch (get_group0_keyval(&event->key)) {
-            case GDK_Control_L:
-            case GDK_Control_R:
+            case GDK_KEY_Control_L:
+            case GDK_KEY_Control_R:
                 dc->_message_context->clear();
                 break;
             default:
diff --git a/src/gradient-context.cpp b/src/gradient-context.cpp
index e10e42610..54f4bdfc1 100644
--- a/src/gradient-context.cpp
+++ b/src/gradient-context.cpp
@@ -48,6 +48,55 @@
 #include "document-undo.h"
 #include "verbs.h"
 
+#if !GTK_CHECK_VERSION(2,22,0)
+#define GDK_KEY_Up 0xff52
+#define GDK_KEY_KP_Up 0xff97
+#define GDK_KEY_Down 0xff54
+#define GDK_KEY_KP_Down 0xff99
+#define GDK_KEY_Left 0xff51
+#define GDK_KEY_KP_Left 0xff96
+#define GDK_KEY_Right 0xff53
+#define GDK_KEY_KP_Right 0xff98
+#define GDK_KEY_Home 0xff50
+#define GDK_KEY_KP_Home 0xff95
+#define GDK_KEY_End 0xff57
+#define GDK_KEY_KP_End 0xff9c
+#define GDK_KEY_a 0x061
+#define GDK_KEY_A 0x041
+#define GDK_KEY_l 0x06c
+#define GDK_KEY_L 0x04c
+#define GDK_KEY_r 0x072
+#define GDK_KEY_R 0x052
+#define GDK_KEY_x 0x078
+#define GDK_KEY_X 0x058
+#define GDK_KEY_z 0x07a
+#define GDK_KEY_Z 0x05a
+#define GDK_KEY_Escape 0xff1b
+#define GDK_KEY_Control_L 0xffe3
+#define GDK_KEY_Control_R 0xffe4
+#define GDK_KEY_Alt_L 0xffe9
+#define GDK_KEY_Alt_R 0xffea
+#define GDK_KEY_Shift_L 0xffe1
+#define GDK_KEY_Shift_R 0xffe2
+#define GDK_KEY_Meta_L 0xffe7
+#define GDK_KEY_Meta_R 0xffe8
+#define GDK_KEY_KP_0 0xffb0
+#define GDK_KEY_KP_1 0xffb1
+#define GDK_KEY_KP_2 0xffb2
+#define GDK_KEY_KP_3 0xffb3
+#define GDK_KEY_KP_4 0xffb4
+#define GDK_KEY_KP_5 0xffb5
+#define GDK_KEY_KP_6 0xffb6
+#define GDK_KEY_KP_7 0xffb7
+#define GDK_KEY_KP_8 0xffb8
+#define GDK_KEY_KP_9 0xffb9
+#define GDK_KEY_Insert 0xff63
+#define GDK_KEY_KP_Insert 0xff9e
+#define GDK_KEY_Delete 0xffff
+#define GDK_KEY_KP_Delete 0xff9f
+#define GDK_KEY_BackSpace 0xff08
+#endif
+
 using Inkscape::DocumentUndo;
 
 static void sp_gradient_context_class_init(SPGradientContextClass *klass);
@@ -713,45 +762,45 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
         break;
     case GDK_KEY_PRESS:
         switch (get_group0_keyval (&event->key)) {
-        case GDK_Alt_L:
-        case GDK_Alt_R:
-        case GDK_Control_L:
-        case GDK_Control_R:
-        case GDK_Shift_L:
-        case GDK_Shift_R:
-        case GDK_Meta_L:  // Meta is when you press Shift+Alt (at least on my machine)
-        case GDK_Meta_R:
+        case GDK_KEY_Alt_L:
+        case GDK_KEY_Alt_R:
+        case GDK_KEY_Control_L:
+        case GDK_KEY_Control_R:
+        case GDK_KEY_Shift_L:
+        case GDK_KEY_Shift_R:
+        case GDK_KEY_Meta_L:  // Meta is when you press Shift+Alt (at least on my machine)
+        case GDK_KEY_Meta_R:
             sp_event_show_modifier_tip (event_context->defaultMessageContext(), event,
                                         _("<b>Ctrl</b>: snap gradient angle"),
                                         _("<b>Shift</b>: draw gradient around the starting point"),
                                         NULL);
             break;
 
-        case GDK_x:
-        case GDK_X:
+        case GDK_KEY_x:
+        case GDK_KEY_X:
             if (MOD__ALT_ONLY) {
                 desktop->setToolboxFocusTo ("altx-grad");
                 ret = TRUE;
             }
             break;
 
-        case GDK_A:
-        case GDK_a:
+        case GDK_KEY_A:
+        case GDK_KEY_a:
             if (MOD__CTRL_ONLY && drag->isNonEmpty()) {
                 drag->selectAll();
                 ret = TRUE;
             }
             break;
 
-        case GDK_L:
-        case GDK_l:
+        case GDK_KEY_L:
+        case GDK_KEY_l:
             if (MOD__CTRL_ONLY && drag->isNonEmpty() && drag->hasSelection()) {
                 sp_gradient_simplify(rc, 1e-4);
                 ret = TRUE;
             }
             break;
 
-        case GDK_Escape:
+        case GDK_KEY_Escape:
             if (drag->selected) {
                 drag->deselectAll();
             } else {
@@ -761,9 +810,9 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
             //TODO: make dragging escapable by Esc
             break;
 
-        case GDK_Left: // move handle left
-        case GDK_KP_Left:
-        case GDK_KP_4:
+        case GDK_KEY_Left: // move handle left
+        case GDK_KEY_KP_Left:
+        case GDK_KEY_KP_4:
             if (!MOD__CTRL) { // not ctrl
                 gint mul = 1 + gobble_key_events(
                     get_group0_keyval(&event->key), 0); // with any mask
@@ -778,9 +827,9 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                 ret = TRUE;
             }
             break;
-        case GDK_Up: // move handle up
-        case GDK_KP_Up:
-        case GDK_KP_8:
+        case GDK_KEY_Up: // move handle up
+        case GDK_KEY_KP_Up:
+        case GDK_KEY_KP_8:
             if (!MOD__CTRL) { // not ctrl
                 gint mul = 1 + gobble_key_events(
                     get_group0_keyval(&event->key), 0); // with any mask
@@ -795,9 +844,9 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                 ret = TRUE;
             }
             break;
-        case GDK_Right: // move handle right
-        case GDK_KP_Right:
-        case GDK_KP_6:
+        case GDK_KEY_Right: // move handle right
+        case GDK_KEY_KP_Right:
+        case GDK_KEY_KP_6:
             if (!MOD__CTRL) { // not ctrl
                 gint mul = 1 + gobble_key_events(
                     get_group0_keyval(&event->key), 0); // with any mask
@@ -812,9 +861,9 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                 ret = TRUE;
             }
             break;
-        case GDK_Down: // move handle down
-        case GDK_KP_Down:
-        case GDK_KP_2:
+        case GDK_KEY_Down: // move handle down
+        case GDK_KEY_KP_Down:
+        case GDK_KEY_KP_2:
             if (!MOD__CTRL) { // not ctrl
                 gint mul = 1 + gobble_key_events(
                     get_group0_keyval(&event->key), 0); // with any mask
@@ -829,8 +878,8 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                 ret = TRUE;
             }
             break;
-        case GDK_r:
-        case GDK_R:
+        case GDK_KEY_r:
+        case GDK_KEY_R:
             if (MOD__SHIFT_ONLY) {
                 // First try selected dragger
                 if (drag && drag->selected) {
@@ -848,16 +897,16 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
             }
             break;
 
-        case GDK_Insert:
-        case GDK_KP_Insert:
+        case GDK_KEY_Insert:
+        case GDK_KEY_KP_Insert:
             // with any modifiers:
             sp_gradient_context_add_stops_between_selected_stops (rc);
             ret = TRUE;
             break;
 
-        case GDK_Delete:
-        case GDK_KP_Delete:
-        case GDK_BackSpace:
+        case GDK_KEY_Delete:
+        case GDK_KEY_KP_Delete:
+        case GDK_KEY_BackSpace:
             if ( drag->selected ) {
                 drag->deleteSelected(MOD__CTRL_ONLY);
                 ret = TRUE;
@@ -869,14 +918,14 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
         break;
     case GDK_KEY_RELEASE:
         switch (get_group0_keyval (&event->key)) {
-        case GDK_Alt_L:
-        case GDK_Alt_R:
-        case GDK_Control_L:
-        case GDK_Control_R:
-        case GDK_Shift_L:
-        case GDK_Shift_R:
-        case GDK_Meta_L:  // Meta is when you press Shift+Alt
-        case GDK_Meta_R:
+        case GDK_KEY_Alt_L:
+        case GDK_KEY_Alt_R:
+        case GDK_KEY_Control_L:
+        case GDK_KEY_Control_R:
+        case GDK_KEY_Shift_L:
+        case GDK_KEY_Shift_R:
+        case GDK_KEY_Meta_L:  // Meta is when you press Shift+Alt
+        case GDK_KEY_Meta_R:
             event_context->defaultMessageContext()->clear();
             break;
         default:
diff --git a/src/knot.cpp b/src/knot.cpp
index aee4fe1a5..fe99eb4e1 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -36,6 +36,10 @@ using Inkscape::DocumentUndo;
 			 GDK_POINTER_MOTION_HINT_MASK | \
 			 GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK)
 
+#if !GTK_CHECK_VERSION(2,22,0)
+#define GDK_KEY_Escape 0xff1b
+#endif
+
 static bool nograb = false;
 
 static bool grabbed = FALSE;
@@ -411,7 +415,7 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot
             break;
     case GDK_KEY_PRESS: // keybindings for knot
             switch (get_group0_keyval(&event->key)) {
-                case GDK_Escape:
+                case GDK_KEY_Escape:
                             sp_knot_set_flag(knot, SP_KNOT_GRABBED, FALSE);
                             if (!nograb) {
                                 sp_canvas_item_ungrab(knot->item, event->button.time);
diff --git a/src/pen-context.cpp b/src/pen-context.cpp
index 5e9f27fb9..dbfd436f0 100644
--- a/src/pen-context.cpp
+++ b/src/pen-context.cpp
@@ -44,6 +44,61 @@
 #include "context-fns.h"
 #include "tools-switch.h"
 
+#if !GTK_CHECK_VERSION(2,22,0)
+#define GDK_KEY_Up 0xff52
+#define GDK_KEY_KP_Up 0xff97
+#define GDK_KEY_Down 0xff54
+#define GDK_KEY_KP_Down 0xff99
+#define GDK_KEY_Left 0xff51
+#define GDK_KEY_KP_Left 0xff96
+#define GDK_KEY_Right 0xff53
+#define GDK_KEY_KP_Right 0xff98
+#define GDK_KEY_Home 0xff50
+#define GDK_KEY_KP_Home 0xff95
+#define GDK_KEY_End 0xff57
+#define GDK_KEY_KP_End 0xff9c
+#define GDK_KEY_a 0x061
+#define GDK_KEY_A 0x041
+#define GDK_KEY_g 0x067
+#define GDK_KEY_G 0x047
+#define GDK_KEY_l 0x06c
+#define GDK_KEY_L 0x04c
+#define GDK_KEY_r 0x072
+#define GDK_KEY_R 0x052
+#define GDK_KEY_u 0x075
+#define GDK_KEY_U 0x055
+#define GDK_KEY_x 0x078
+#define GDK_KEY_X 0x058
+#define GDK_KEY_z 0x07a
+#define GDK_KEY_Z 0x05a
+#define GDK_KEY_Escape 0xff1b
+#define GDK_KEY_Control_L 0xffe3
+#define GDK_KEY_Control_R 0xffe4
+#define GDK_KEY_Alt_L 0xffe9
+#define GDK_KEY_Alt_R 0xffea
+#define GDK_KEY_Shift_L 0xffe1
+#define GDK_KEY_Shift_R 0xffe2
+#define GDK_KEY_Meta_L 0xffe7
+#define GDK_KEY_Meta_R 0xffe8
+#define GDK_KEY_KP_0 0xffb0
+#define GDK_KEY_KP_1 0xffb1
+#define GDK_KEY_KP_2 0xffb2
+#define GDK_KEY_KP_3 0xffb3
+#define GDK_KEY_KP_4 0xffb4
+#define GDK_KEY_KP_5 0xffb5
+#define GDK_KEY_KP_6 0xffb6
+#define GDK_KEY_KP_7 0xffb7
+#define GDK_KEY_KP_8 0xffb8
+#define GDK_KEY_KP_9 0xffb9
+#define GDK_KEY_Insert 0xff63
+#define GDK_KEY_KP_Insert 0xff9e
+#define GDK_KEY_Delete 0xffff
+#define GDK_KEY_KP_Delete 0xff9f
+#define GDK_KEY_BackSpace 0xff08
+#define GDK_KEY_Return 0xff0d
+#define GDK_KEY_KP_Enter 0xff8d
+#endif
+
 static void sp_pen_context_class_init(SPPenContextClass *klass);
 static void sp_pen_context_init(SPPenContext *pc);
 static void sp_pen_context_dispose(GObject *object);
@@ -995,9 +1050,9 @@ pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
 
     switch (get_group0_keyval (&event->key)) {
 
-        case GDK_Left: // move last point left
-        case GDK_KP_Left:
-        case GDK_KP_4:
+        case GDK_KEY_Left: // move last point left
+        case GDK_KEY_KP_Left:
+        case GDK_KEY_KP_4:
             if (!MOD__CTRL) { // not ctrl
                 if (MOD__ALT) { // alt
                     if (MOD__SHIFT) pen_lastpoint_move_screen(pc, -10, 0); // shift
@@ -1010,9 +1065,9 @@ pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
                 ret = TRUE;
             }
             break;
-        case GDK_Up: // move last point up
-        case GDK_KP_Up:
-        case GDK_KP_8:
+        case GDK_KEY_Up: // move last point up
+        case GDK_KEY_KP_Up:
+        case GDK_KEY_KP_8:
             if (!MOD__CTRL) { // not ctrl
                 if (MOD__ALT) { // alt
                     if (MOD__SHIFT) pen_lastpoint_move_screen(pc, 0, 10); // shift
@@ -1025,9 +1080,9 @@ pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
                 ret = TRUE;
             }
             break;
-        case GDK_Right: // move last point right
-        case GDK_KP_Right:
-        case GDK_KP_6:
+        case GDK_KEY_Right: // move last point right
+        case GDK_KEY_KP_Right:
+        case GDK_KEY_KP_6:
             if (!MOD__CTRL) { // not ctrl
                 if (MOD__ALT) { // alt
                     if (MOD__SHIFT) pen_lastpoint_move_screen(pc, 10, 0); // shift
@@ -1040,9 +1095,9 @@ pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
                 ret = TRUE;
             }
             break;
-        case GDK_Down: // move last point down
-        case GDK_KP_Down:
-        case GDK_KP_2:
+        case GDK_KEY_Down: // move last point down
+        case GDK_KEY_KP_Down:
+        case GDK_KEY_KP_2:
             if (!MOD__CTRL) { // not ctrl
                 if (MOD__ALT) { // alt
                     if (MOD__SHIFT) pen_lastpoint_move_screen(pc, 0, -10); // shift
@@ -1057,32 +1112,32 @@ pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
             break;
 
 /* TODO: this is not yet enabled?? looks like some traces of the Geometry tool
-        case GDK_P:
-        case GDK_p:
+        case GDK_KEY_P:
+        case GDK_KEY_p:
             if (MOD__SHIFT_ONLY) {
                 sp_pen_context_wait_for_LPE_mouse_clicks(pc, Inkscape::LivePathEffect::PARALLEL, 2);
                 ret = TRUE;
             }
             break;
 
-        case GDK_C:
-        case GDK_c:
+        case GDK_KEY_C:
+        case GDK_KEY_c:
             if (MOD__SHIFT_ONLY) {
                 sp_pen_context_wait_for_LPE_mouse_clicks(pc, Inkscape::LivePathEffect::CIRCLE_3PTS, 3);
                 ret = TRUE;
             }
             break;
 
-        case GDK_B:
-        case GDK_b:
+        case GDK_KEY_B:
+        case GDK_KEY_b:
             if (MOD__SHIFT_ONLY) {
                 sp_pen_context_wait_for_LPE_mouse_clicks(pc, Inkscape::LivePathEffect::PERP_BISECTOR, 2);
                 ret = TRUE;
             }
             break;
 
-        case GDK_A:
-        case GDK_a:
+        case GDK_KEY_A:
+        case GDK_KEY_a:
             if (MOD__SHIFT_ONLY) {
                 sp_pen_context_wait_for_LPE_mouse_clicks(pc, Inkscape::LivePathEffect::ANGLE_BISECTOR, 3);
                 ret = TRUE;
@@ -1090,53 +1145,53 @@ pen_handle_key_press(SPPenContext *const pc, GdkEvent *event)
             break;
 */
 
-        case GDK_U:
-        case GDK_u:
+        case GDK_KEY_U:
+        case GDK_KEY_u:
             if (MOD__SHIFT_ONLY) {
                 pen_lastpoint_tocurve(pc);
                 ret = TRUE;
             }
             break;
-        case GDK_L:
-        case GDK_l:
+        case GDK_KEY_L:
+        case GDK_KEY_l:
             if (MOD__SHIFT_ONLY) {
                 pen_lastpoint_toline(pc);
                 ret = TRUE;
             }
             break;
 
-        case GDK_Return:
-        case GDK_KP_Enter:
+        case GDK_KEY_Return:
+        case GDK_KEY_KP_Enter:
             if (pc->npoints != 0) {
                 spdc_pen_finish(pc, FALSE);
                 ret = TRUE;
             }
             break;
-        case GDK_Escape:
+        case GDK_KEY_Escape:
             if (pc->npoints != 0) {
                 // if drawing, cancel, otherwise pass it up for deselecting
                 pen_cancel (pc);
                 ret = TRUE;
             }
             break;
-        case GDK_z:
-        case GDK_Z:
+        case GDK_KEY_z:
+        case GDK_KEY_Z:
             if (MOD__CTRL_ONLY && pc->npoints != 0) {
                 // if drawing, cancel, otherwise pass it up for undo
                 pen_cancel (pc);
                 ret = TRUE;
             }
             break;
-        case GDK_g:
-        case GDK_G:
+        case GDK_KEY_g:
+        case GDK_KEY_G:
             if (MOD__SHIFT_ONLY) {
                 sp_selection_to_guides(SP_EVENT_CONTEXT(pc)->desktop);
                 ret = true;
             }
             break;
-        case GDK_BackSpace:
-        case GDK_Delete:
-        case GDK_KP_Delete:
+        case GDK_KEY_BackSpace:
+        case GDK_KEY_Delete:
+        case GDK_KEY_KP_Delete:
             if ( pc->green_curve->is_empty() || (pc->green_curve->last_segment() == NULL) ) {
                 if (!pc->red_curve->is_empty()) {
                     pen_cancel (pc);
diff --git a/src/pencil-context.cpp b/src/pencil-context.cpp
index e6bd8f297..03fa507de 100644
--- a/src/pencil-context.cpp
+++ b/src/pencil-context.cpp
@@ -45,6 +45,58 @@
 #include "display/curve.h"
 #include "livarot/Path.h"
 
+#if !GTK_CHECK_VERSION(2,22,0)
+#define GDK_KEY_Up 0xff52
+#define GDK_KEY_KP_Up 0xff97
+#define GDK_KEY_Down 0xff54
+#define GDK_KEY_KP_Down 0xff99
+#define GDK_KEY_Left 0xff51
+#define GDK_KEY_KP_Left 0xff96
+#define GDK_KEY_Right 0xff53
+#define GDK_KEY_KP_Right 0xff98
+#define GDK_KEY_Home 0xff50
+#define GDK_KEY_KP_Home 0xff95
+#define GDK_KEY_End 0xff57
+#define GDK_KEY_KP_End 0xff9c
+#define GDK_KEY_a 0x061
+#define GDK_KEY_A 0x041
+#define GDK_KEY_g 0x067
+#define GDK_KEY_G 0x047
+#define GDK_KEY_l 0x06c
+#define GDK_KEY_L 0x04c
+#define GDK_KEY_r 0x072
+#define GDK_KEY_R 0x052
+#define GDK_KEY_x 0x078
+#define GDK_KEY_X 0x058
+#define GDK_KEY_z 0x07a
+#define GDK_KEY_Z 0x05a
+#define GDK_KEY_Escape 0xff1b
+#define GDK_KEY_Control_L 0xffe3
+#define GDK_KEY_Control_R 0xffe4
+#define GDK_KEY_Alt_L 0xffe9
+#define GDK_KEY_Alt_R 0xffea
+#define GDK_KEY_Shift_L 0xffe1
+#define GDK_KEY_Shift_R 0xffe2
+#define GDK_KEY_Meta_L 0xffe7
+#define GDK_KEY_Meta_R 0xffe8
+#define GDK_KEY_KP_0 0xffb0
+#define GDK_KEY_KP_1 0xffb1
+#define GDK_KEY_KP_2 0xffb2
+#define GDK_KEY_KP_3 0xffb3
+#define GDK_KEY_KP_4 0xffb4
+#define GDK_KEY_KP_5 0xffb5
+#define GDK_KEY_KP_6 0xffb6
+#define GDK_KEY_KP_7 0xffb7
+#define GDK_KEY_KP_8 0xffb8
+#define GDK_KEY_KP_9 0xffb9
+#define GDK_KEY_Insert 0xff63
+#define GDK_KEY_KP_Insert 0xff9e
+#define GDK_KEY_Delete 0xffff
+#define GDK_KEY_KP_Delete 0xff9f
+#define GDK_KEY_BackSpace 0xff08
+#endif
+
+
 static void sp_pencil_context_class_init(SPPencilContextClass *klass);
 static void sp_pencil_context_init(SPPencilContext *pc);
 static void sp_pencil_context_setup(SPEventContext *ec);
@@ -567,16 +619,16 @@ pencil_handle_key_press(SPPencilContext *const pc, guint const keyval, guint con
 {
     gint ret = FALSE;
     switch (keyval) {
-        case GDK_Up:
-        case GDK_Down:
-        case GDK_KP_Up:
-        case GDK_KP_Down:
+        case GDK_KEY_Up:
+        case GDK_KEY_Down:
+        case GDK_KEY_KP_Up:
+        case GDK_KEY_KP_Down:
             // Prevent the zoom field from activation.
             if (!mod_ctrl_only(state)) {
                 ret = TRUE;
             }
             break;
-        case GDK_Escape:
+        case GDK_KEY_Escape:
             if (pc->npoints != 0) {
                 // if drawing, cancel, otherwise pass it up for deselecting
                 if (pc->state != SP_PENCIL_CONTEXT_IDLE) {
@@ -585,8 +637,8 @@ pencil_handle_key_press(SPPencilContext *const pc, guint const keyval, guint con
                 }
             }
             break;
-        case GDK_z:
-        case GDK_Z:
+        case GDK_KEY_z:
+        case GDK_KEY_Z:
             if (mod_ctrl_only(state) && pc->npoints != 0) {
                 // if drawing, cancel, otherwise pass it up for undo
                 if (pc->state != SP_PENCIL_CONTEXT_IDLE) {
@@ -595,17 +647,17 @@ pencil_handle_key_press(SPPencilContext *const pc, guint const keyval, guint con
                 }
             }
             break;
-        case GDK_g:
-        case GDK_G:
+        case GDK_KEY_g:
+        case GDK_KEY_G:
             if (mod_shift_only(state)) {
                 sp_selection_to_guides(SP_EVENT_CONTEXT(pc)->desktop);
                 ret = true;
             }
             break;
-        case GDK_Alt_L:
-        case GDK_Alt_R:
-        case GDK_Meta_L:
-        case GDK_Meta_R:
+        case GDK_KEY_Alt_L:
+        case GDK_KEY_Alt_R:
+        case GDK_KEY_Meta_L:
+        case GDK_KEY_Meta_R:
             if (pc->state == SP_PENCIL_CONTEXT_IDLE) {
                 pc->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("<b>Sketch mode</b>: holding <b>Alt</b> interpolates between sketched paths. Release <b>Alt</b> to finalize."));
             }
diff --git a/src/rect-context.cpp b/src/rect-context.cpp
index 7231038dc..d1f10d1ec 100644
--- a/src/rect-context.cpp
+++ b/src/rect-context.cpp
@@ -46,6 +46,62 @@
 #include "verbs.h"
 #include "display/sp-canvas-item.h"
 
+#if !GTK_CHECK_VERSION(2,22,0)
+#define GDK_KEY_Up 0xff52
+#define GDK_KEY_KP_Up 0xff97
+#define GDK_KEY_Down 0xff54
+#define GDK_KEY_KP_Down 0xff99
+#define GDK_KEY_Left 0xff51
+#define GDK_KEY_KP_Left 0xff96
+#define GDK_KEY_Right 0xff53
+#define GDK_KEY_KP_Right 0xff98
+#define GDK_KEY_Home 0xff50
+#define GDK_KEY_KP_Home 0xff95
+#define GDK_KEY_End 0xff57
+#define GDK_KEY_KP_End 0xff9c
+#define GDK_KEY_a 0x061
+#define GDK_KEY_A 0x041
+#define GDK_KEY_g 0x067
+#define GDK_KEY_G 0x047
+#define GDK_KEY_l 0x06c
+#define GDK_KEY_L 0x04c
+#define GDK_KEY_r 0x072
+#define GDK_KEY_R 0x052
+#define GDK_KEY_u 0x075
+#define GDK_KEY_U 0x055
+#define GDK_KEY_x 0x078
+#define GDK_KEY_X 0x058
+#define GDK_KEY_z 0x07a
+#define GDK_KEY_Z 0x05a
+#define GDK_KEY_Escape 0xff1b
+#define GDK_KEY_Control_L 0xffe3
+#define GDK_KEY_Control_R 0xffe4
+#define GDK_KEY_Alt_L 0xffe9
+#define GDK_KEY_Alt_R 0xffea
+#define GDK_KEY_Shift_L 0xffe1
+#define GDK_KEY_Shift_R 0xffe2
+#define GDK_KEY_Meta_L 0xffe7
+#define GDK_KEY_Meta_R 0xffe8
+#define GDK_KEY_KP_0 0xffb0
+#define GDK_KEY_KP_1 0xffb1
+#define GDK_KEY_KP_2 0xffb2
+#define GDK_KEY_KP_3 0xffb3
+#define GDK_KEY_KP_4 0xffb4
+#define GDK_KEY_KP_5 0xffb5
+#define GDK_KEY_KP_6 0xffb6
+#define GDK_KEY_KP_7 0xffb7
+#define GDK_KEY_KP_8 0xffb8
+#define GDK_KEY_KP_9 0xffb9
+#define GDK_KEY_Insert 0xff63
+#define GDK_KEY_KP_Insert 0xff9e
+#define GDK_KEY_Delete 0xffff
+#define GDK_KEY_KP_Delete 0xff9f
+#define GDK_KEY_BackSpace 0xff08
+#define GDK_KEY_Return 0xff0d
+#define GDK_KEY_KP_Enter 0xff8d
+#define GDK_KEY_space 0x020
+#endif
+
 using Inkscape::DocumentUndo;
 
 //static const double goldenratio = 1.61803398874989484820; // golden ratio
@@ -364,14 +420,14 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
         break;
     case GDK_KEY_PRESS:
         switch (get_group0_keyval (&event->key)) {
-        case GDK_Alt_L:
-        case GDK_Alt_R:
-        case GDK_Control_L:
-        case GDK_Control_R:
-        case GDK_Shift_L:
-        case GDK_Shift_R:
-        case GDK_Meta_L:  // Meta is when you press Shift+Alt (at least on my machine)
-        case GDK_Meta_R:
+        case GDK_KEY_Alt_L:
+        case GDK_KEY_Alt_R:
+        case GDK_KEY_Control_L:
+        case GDK_KEY_Control_R:
+        case GDK_KEY_Shift_L:
+        case GDK_KEY_Shift_R:
+        case GDK_KEY_Meta_L:  // Meta is when you press Shift+Alt (at least on my machine)
+        case GDK_KEY_Meta_R:
             if (!dragging){
                 sp_event_show_modifier_tip (event_context->defaultMessageContext(), event,
                                             _("<b>Ctrl</b>: make square or integer-ratio rect, lock a rounded corner circular"),
@@ -379,32 +435,32 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
                                             NULL);
             }
             break;
-        case GDK_Up:
-        case GDK_Down:
-        case GDK_KP_Up:
-        case GDK_KP_Down:
+        case GDK_KEY_Up:
+        case GDK_KEY_Down:
+        case GDK_KEY_KP_Up:
+        case GDK_KEY_KP_Down:
             // prevent the zoom field from activation
             if (!MOD__CTRL_ONLY)
                 ret = TRUE;
             break;
 
-        case GDK_x:
-        case GDK_X:
+        case GDK_KEY_x:
+        case GDK_KEY_X:
             if (MOD__ALT_ONLY) {
                 desktop->setToolboxFocusTo ("altx-rect");
                 ret = TRUE;
             }
             break;
 
-        case GDK_g:
-        case GDK_G:
+        case GDK_KEY_g:
+        case GDK_KEY_G:
             if (MOD__SHIFT_ONLY) {
                 sp_selection_to_guides(desktop);
                 ret = true;
             }
             break;
 
-        case GDK_Escape:
+        case GDK_KEY_Escape:
             if (dragging) {
                 dragging = false;
                 sp_event_context_discard_delayed_snap_event(event_context);
@@ -414,7 +470,7 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
             }
             break;
 
-        case GDK_space:
+        case GDK_KEY_space:
             if (dragging) {
                 sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
                                       event->button.time);
@@ -434,14 +490,14 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
         break;
     case GDK_KEY_RELEASE:
         switch (get_group0_keyval (&event->key)) {
-        case GDK_Alt_L:
-        case GDK_Alt_R:
-        case GDK_Control_L:
-        case GDK_Control_R:
-        case GDK_Shift_L:
-        case GDK_Shift_R:
-        case GDK_Meta_L:  // Meta is when you press Shift+Alt
-        case GDK_Meta_R:
+        case GDK_KEY_Alt_L:
+        case GDK_KEY_Alt_R:
+        case GDK_KEY_Control_L:
+        case GDK_KEY_Control_R:
+        case GDK_KEY_Shift_L:
+        case GDK_KEY_Shift_R:
+        case GDK_KEY_Meta_L:  // Meta is when you press Shift+Alt
+        case GDK_KEY_Meta_R:
             event_context->defaultMessageContext()->clear();
             break;
         default:
diff --git a/src/select-context.cpp b/src/select-context.cpp
index 922329d7a..70955c969 100644
--- a/src/select-context.cpp
+++ b/src/select-context.cpp
@@ -49,6 +49,72 @@
 #include "display/sp-canvas.h"
 #include "display/drawing-item.h"
 
+#if !GTK_CHECK_VERSION(2,22,0)
+#define GDK_KEY_Up 0xff52
+#define GDK_KEY_KP_Up 0xff97
+#define GDK_KEY_Down 0xff54
+#define GDK_KEY_KP_Down 0xff99
+#define GDK_KEY_Left 0xff51
+#define GDK_KEY_KP_Left 0xff96
+#define GDK_KEY_Right 0xff53
+#define GDK_KEY_KP_Right 0xff98
+#define GDK_KEY_Home 0xff50
+#define GDK_KEY_KP_Home 0xff95
+#define GDK_KEY_End 0xff57
+#define GDK_KEY_KP_End 0xff9c
+#define GDK_KEY_a 0x061
+#define GDK_KEY_A 0x041
+#define GDK_KEY_g 0x067
+#define GDK_KEY_G 0x047
+#define GDK_KEY_l 0x06c
+#define GDK_KEY_L 0x04c
+#define GDK_KEY_r 0x072
+#define GDK_KEY_R 0x052
+#define GDK_KEY_s 0x073
+#define GDK_KEY_S 0x053
+#define GDK_KEY_u 0x075
+#define GDK_KEY_U 0x055
+#define GDK_KEY_x 0x078
+#define GDK_KEY_X 0x058
+#define GDK_KEY_z 0x07a
+#define GDK_KEY_Z 0x05a
+#define GDK_KEY_Escape 0xff1b
+#define GDK_KEY_Control_L 0xffe3
+#define GDK_KEY_Control_R 0xffe4
+#define GDK_KEY_Alt_L 0xffe9
+#define GDK_KEY_Alt_R 0xffea
+#define GDK_KEY_Shift_L 0xffe1
+#define GDK_KEY_Shift_R 0xffe2
+#define GDK_KEY_Meta_L 0xffe7
+#define GDK_KEY_Meta_R 0xffe8
+#define GDK_KEY_KP_0 0xffb0
+#define GDK_KEY_KP_1 0xffb1
+#define GDK_KEY_KP_2 0xffb2
+#define GDK_KEY_KP_3 0xffb3
+#define GDK_KEY_KP_4 0xffb4
+#define GDK_KEY_KP_5 0xffb5
+#define GDK_KEY_KP_6 0xffb6
+#define GDK_KEY_KP_7 0xffb7
+#define GDK_KEY_KP_8 0xffb8
+#define GDK_KEY_KP_9 0xffb9
+#define GDK_KEY_Insert 0xff63
+#define GDK_KEY_KP_Insert 0xff9e
+#define GDK_KEY_Delete 0xffff
+#define GDK_KEY_KP_Delete 0xff9f
+#define GDK_KEY_BackSpace 0xff08
+#define GDK_KEY_Return 0xff0d
+#define GDK_KEY_KP_Enter 0xff8d
+#define GDK_KEY_space 0x020
+#define GDK_KEY_Tab 0xff09
+#define GDK_KEY_ISO_Left_Tab 0xfe20
+#define GDK_KEY_bracketleft 0x05b
+#define GDK_KEY_bracketright 0x05d
+#define GDK_KEY_less 0x03c
+#define GDK_KEY_greater 0x03e
+#define GDK_KEY_comma 0x02c
+#define GDK_KEY_period 0x02e
+#endif
+
 using Inkscape::DocumentUndo;
 
 
@@ -265,14 +331,14 @@ sp_select_context_abort(SPEventContext *event_context)
 
 bool
 key_is_a_modifier (guint key) {
-    return (key == GDK_Alt_L ||
-                key == GDK_Alt_R ||
-                key == GDK_Control_L ||
-                key == GDK_Control_R ||
-                key == GDK_Shift_L ||
-                key == GDK_Shift_R ||
-                key == GDK_Meta_L ||  // Meta is when you press Shift+Alt (at least on my machine)
-            key == GDK_Meta_R);
+    return (key == GDK_KEY_Alt_L ||
+                key == GDK_KEY_Alt_R ||
+                key == GDK_KEY_Control_L ||
+                key == GDK_KEY_Control_R ||
+                key == GDK_KEY_Shift_L ||
+                key == GDK_KEY_Shift_R ||
+                key == GDK_KEY_Meta_L ||  // Meta is when you press Shift+Alt (at least on my machine)
+            key == GDK_KEY_Meta_R);
 }
 
 void
@@ -399,18 +465,18 @@ sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkE
             break;
 
         case GDK_KEY_PRESS:
-            if (get_group0_keyval (&event->key) == GDK_space) {
+            if (get_group0_keyval (&event->key) == GDK_KEY_space) {
                 if (sc->dragging && sc->grabbed) {
                     /* stamping mode: show content mode moving */
                     seltrans->stamp();
                     ret = TRUE;
                 }
-            } else if (get_group0_keyval (&event->key) == GDK_Tab) {
+            } else if (get_group0_keyval (&event->key) == GDK_KEY_Tab) {
                 if (sc->dragging && sc->grabbed) {
                     seltrans->getNextClosestPoint(false);
                     ret = TRUE;
                 }
-            } else if (get_group0_keyval (&event->key) == GDK_ISO_Left_Tab) {
+            } else if (get_group0_keyval (&event->key) == GDK_KEY_ISO_Left_Tab) {
                 if (sc->dragging && sc->grabbed) {
                     seltrans->getNextClosestPoint(true);
                     ret = TRUE;
@@ -862,10 +928,10 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
 			{
         	guint keyval = get_group0_keyval(&event->key);
             bool alt = ( MOD__ALT
-                                    || (keyval == GDK_Alt_L)
-                                    || (keyval == GDK_Alt_R)
-                                    || (keyval == GDK_Meta_L)
-                                    || (keyval == GDK_Meta_R));
+                                    || (keyval == GDK_KEY_Alt_L)
+                                    || (keyval == GDK_KEY_Alt_R)
+                                    || (keyval == GDK_KEY_Meta_L)
+                                    || (keyval == GDK_KEY_Meta_R));
 
             if (!key_is_a_modifier (keyval)) {
                     event_context->defaultMessageContext()->clear();
@@ -900,9 +966,9 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
 			int const snaps = prefs->getInt("/options/rotationsnapsperpi/value", 12);
 
 			switch (get_group0_keyval (&event->key)) {
-                case GDK_Left: // move selection left
-                case GDK_KP_Left:
-                case GDK_KP_4:
+                case GDK_KEY_Left: // move selection left
+                case GDK_KEY_KP_Left:
+                case GDK_KEY_KP_4:
                     if (!MOD__CTRL) { // not ctrl
                         gint mul = 1 + gobble_key_events(
                             get_group0_keyval(&event->key), 0); // with any mask
@@ -917,9 +983,9 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                         ret = TRUE;
                     }
                     break;
-                case GDK_Up: // move selection up
-                case GDK_KP_Up:
-                case GDK_KP_8:
+                case GDK_KEY_Up: // move selection up
+                case GDK_KEY_KP_Up:
+                case GDK_KEY_KP_8:
                     if (!MOD__CTRL) { // not ctrl
                         gint mul = 1 + gobble_key_events(
                             get_group0_keyval(&event->key), 0); // with any mask
@@ -934,9 +1000,9 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                         ret = TRUE;
                     }
                     break;
-                case GDK_Right: // move selection right
-                case GDK_KP_Right:
-                case GDK_KP_6:
+                case GDK_KEY_Right: // move selection right
+                case GDK_KEY_KP_Right:
+                case GDK_KEY_KP_6:
                     if (!MOD__CTRL) { // not ctrl
                         gint mul = 1 + gobble_key_events(
                             get_group0_keyval(&event->key), 0); // with any mask
@@ -951,9 +1017,9 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                         ret = TRUE;
                     }
                     break;
-                case GDK_Down: // move selection down
-                case GDK_KP_Down:
-                case GDK_KP_2:
+                case GDK_KEY_Down: // move selection down
+                case GDK_KEY_KP_Down:
+                case GDK_KEY_KP_2:
                     if (!MOD__CTRL) { // not ctrl
                         gint mul = 1 + gobble_key_events(
                             get_group0_keyval(&event->key), 0); // with any mask
@@ -968,20 +1034,20 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                         ret = TRUE;
                     }
                     break;
-                case GDK_Escape:
+                case GDK_KEY_Escape:
                     if (!sp_select_context_abort(event_context))
                         selection->clear();
                     ret = TRUE;
                     break;
 
-                case GDK_a:
-                case GDK_A:
+                case GDK_KEY_a:
+                case GDK_KEY_A:
                     if (MOD__CTRL_ONLY) {
                         sp_edit_select_all(desktop);
                         ret = TRUE;
                     }
                     break;
-                case GDK_space:
+                case GDK_KEY_space:
                     /* stamping mode: show outline mode moving */
                     /* FIXME: Is next condition ok? (lauris) */
                     if (sc->dragging && sc->grabbed) {
@@ -989,14 +1055,14 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                         ret = TRUE;
                     }
                     break;
-                case GDK_x:
-                case GDK_X:
+                case GDK_KEY_x:
+                case GDK_KEY_X:
                     if (MOD__ALT_ONLY) {
                         desktop->setToolboxFocusTo ("altx");
                         ret = TRUE;
                     }
                     break;
-                case GDK_bracketleft:
+                case GDK_KEY_bracketleft:
                     if (MOD__ALT) {
                         gint mul = 1 + gobble_key_events(
                             get_group0_keyval(&event->key), 0); // with any mask
@@ -1008,7 +1074,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                     }
                     ret = TRUE;
                     break;
-                case GDK_bracketright:
+                case GDK_KEY_bracketright:
                     if (MOD__ALT) {
                         gint mul = 1 + gobble_key_events(
                             get_group0_keyval(&event->key), 0); // with any mask
@@ -1020,8 +1086,8 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                     }
                     ret = TRUE;
                     break;
-                case GDK_less:
-                case GDK_comma:
+                case GDK_KEY_less:
+                case GDK_KEY_comma:
                     if (MOD__ALT) {
                         gint mul = 1 + gobble_key_events(
                             get_group0_keyval(&event->key), 0); // with any mask
@@ -1035,8 +1101,8 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                     }
                     ret = TRUE;
                     break;
-                case GDK_greater:
-                case GDK_period:
+                case GDK_KEY_greater:
+                case GDK_KEY_period:
                     if (MOD__ALT) {
                         gint mul = 1 + gobble_key_events(
                             get_group0_keyval(&event->key), 0); // with any mask
@@ -1050,7 +1116,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                     }
                     ret = TRUE;
                     break;
-                case GDK_Return:
+                case GDK_KEY_Return:
                     if (MOD__CTRL_ONLY) {
                         if (selection->singleItem()) {
                             SPItem *clicked_item = selection->singleItem();
@@ -1065,14 +1131,14 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                         ret = TRUE;
                     }
                     break;
-                case GDK_BackSpace:
+                case GDK_KEY_BackSpace:
                     if (MOD__CTRL_ONLY) {
                         sp_select_context_up_one_layer(desktop);
                         ret = TRUE;
                     }
                     break;
-                case GDK_s:
-                case GDK_S:
+                case GDK_KEY_s:
+                case GDK_KEY_S:
                     if (MOD__SHIFT_ONLY) {
                         if (!selection->isEmpty()) {
                             seltrans->increaseState();
@@ -1080,8 +1146,8 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                         ret = TRUE;
                     }
                     break;
-                case GDK_g:
-                case GDK_G:
+                case GDK_KEY_g:
+                case GDK_KEY_G:
                     if (MOD__SHIFT_ONLY) {
                         sp_selection_to_guides(desktop);
                         ret = true;
@@ -1099,10 +1165,10 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                 event_context->defaultMessageContext()->clear();
 
             bool alt = ( MOD__ALT
-                         || (keyval == GDK_Alt_L)
-                         || (keyval == GDK_Alt_R)
-                         || (keyval == GDK_Meta_L)
-                         || (keyval == GDK_Meta_R));
+                         || (keyval == GDK_KEY_Alt_L)
+                         || (keyval == GDK_KEY_Alt_R)
+                         || (keyval == GDK_KEY_Meta_L)
+                         || (keyval == GDK_KEY_Meta_R));
 
             if (Inkscape::Rubberband::get(desktop)->is_started()) {
                 // if Alt then change cursor to moving cursor:
diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index 45574fee1..4ddac3c20 100644
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
@@ -47,6 +47,10 @@
 #include <2geom/angle.h>
 #include "display/snap-indicator.h"
 
+#if !GTK_CHECK_VERSION(2,22,0)
+#define GDK_KEY_space 0x020
+#endif
+
 using Inkscape::DocumentUndo;
 
 static void sp_remove_handles(SPKnot *knot[], gint num);
@@ -65,7 +69,7 @@ static gboolean sp_seltrans_handle_event(SPKnot *knot, GdkEvent *event, gpointer
         case GDK_MOTION_NOTIFY:
             break;
         case GDK_KEY_PRESS:
-            if (get_group0_keyval (&event->key) == GDK_space) {
+            if (get_group0_keyval (&event->key) == GDK_KEY_space) {
                 /* stamping mode: both mode(show content and outline) operation with knot */
                 if (!SP_KNOT_IS_GRABBED(knot)) {
                     return FALSE;
diff --git a/src/spiral-context.cpp b/src/spiral-context.cpp
index cb2100cca..17d46ec2b 100644
--- a/src/spiral-context.cpp
+++ b/src/spiral-context.cpp
@@ -45,6 +45,72 @@
 #include "verbs.h"
 #include "display/sp-canvas-item.h"
 
+#if !GTK_CHECK_VERSION(2,22,0)
+#define GDK_KEY_Up 0xff52
+#define GDK_KEY_KP_Up 0xff97
+#define GDK_KEY_Down 0xff54
+#define GDK_KEY_KP_Down 0xff99
+#define GDK_KEY_Left 0xff51
+#define GDK_KEY_KP_Left 0xff96
+#define GDK_KEY_Right 0xff53
+#define GDK_KEY_KP_Right 0xff98
+#define GDK_KEY_Home 0xff50
+#define GDK_KEY_KP_Home 0xff95
+#define GDK_KEY_End 0xff57
+#define GDK_KEY_KP_End 0xff9c
+#define GDK_KEY_a 0x061
+#define GDK_KEY_A 0x041
+#define GDK_KEY_g 0x067
+#define GDK_KEY_G 0x047
+#define GDK_KEY_l 0x06c
+#define GDK_KEY_L 0x04c
+#define GDK_KEY_r 0x072
+#define GDK_KEY_R 0x052
+#define GDK_KEY_s 0x073
+#define GDK_KEY_S 0x053
+#define GDK_KEY_u 0x075
+#define GDK_KEY_U 0x055
+#define GDK_KEY_x 0x078
+#define GDK_KEY_X 0x058
+#define GDK_KEY_z 0x07a
+#define GDK_KEY_Z 0x05a
+#define GDK_KEY_Escape 0xff1b
+#define GDK_KEY_Control_L 0xffe3
+#define GDK_KEY_Control_R 0xffe4
+#define GDK_KEY_Alt_L 0xffe9
+#define GDK_KEY_Alt_R 0xffea
+#define GDK_KEY_Shift_L 0xffe1
+#define GDK_KEY_Shift_R 0xffe2
+#define GDK_KEY_Meta_L 0xffe7
+#define GDK_KEY_Meta_R 0xffe8
+#define GDK_KEY_KP_0 0xffb0
+#define GDK_KEY_KP_1 0xffb1
+#define GDK_KEY_KP_2 0xffb2
+#define GDK_KEY_KP_3 0xffb3
+#define GDK_KEY_KP_4 0xffb4
+#define GDK_KEY_KP_5 0xffb5
+#define GDK_KEY_KP_6 0xffb6
+#define GDK_KEY_KP_7 0xffb7
+#define GDK_KEY_KP_8 0xffb8
+#define GDK_KEY_KP_9 0xffb9
+#define GDK_KEY_Insert 0xff63
+#define GDK_KEY_KP_Insert 0xff9e
+#define GDK_KEY_Delete 0xffff
+#define GDK_KEY_KP_Delete 0xff9f
+#define GDK_KEY_BackSpace 0xff08
+#define GDK_KEY_Return 0xff0d
+#define GDK_KEY_KP_Enter 0xff8d
+#define GDK_KEY_space 0x020
+#define GDK_KEY_Tab 0xff09
+#define GDK_KEY_ISO_Left_Tab 0xfe20
+#define GDK_KEY_bracketleft 0x05b
+#define GDK_KEY_bracketright 0x05d
+#define GDK_KEY_less 0x03c
+#define GDK_KEY_greater 0x03e
+#define GDK_KEY_comma 0x02c
+#define GDK_KEY_period 0x02e
+#endif
+
 using Inkscape::DocumentUndo;
 
 static void sp_spiral_context_class_init(SPSpiralContextClass * klass);
@@ -318,34 +384,34 @@ sp_spiral_context_root_handler(SPEventContext *event_context, GdkEvent *event)
             break;
         case GDK_KEY_PRESS:
             switch (get_group0_keyval(&event->key)) {
-                case GDK_Alt_R:
-                case GDK_Control_L:
-                case GDK_Control_R:
-                case GDK_Shift_L:
-                case GDK_Shift_R:
-                case GDK_Meta_L:  // Meta is when you press Shift+Alt (at least on my machine)
-                case GDK_Meta_R:
+                case GDK_KEY_Alt_R:
+                case GDK_KEY_Control_L:
+                case GDK_KEY_Control_R:
+                case GDK_KEY_Shift_L:
+                case GDK_KEY_Shift_R:
+                case GDK_KEY_Meta_L:  // Meta is when you press Shift+Alt (at least on my machine)
+                case GDK_KEY_Meta_R:
                     sp_event_show_modifier_tip(event_context->defaultMessageContext(), event,
                                                _("<b>Ctrl</b>: snap angle"),
                                                NULL,
                                                _("<b>Alt</b>: lock spiral radius"));
                     break;
-                case GDK_Up:
-                case GDK_Down:
-                case GDK_KP_Up:
-                case GDK_KP_Down:
+                case GDK_KEY_Up:
+                case GDK_KEY_Down:
+                case GDK_KEY_KP_Up:
+                case GDK_KEY_KP_Down:
                     // prevent the zoom field from activation
                     if (!MOD__CTRL_ONLY)
                         ret = TRUE;
                     break;
-                case GDK_x:
-                case GDK_X:
+                case GDK_KEY_x:
+                case GDK_KEY_X:
                     if (MOD__ALT_ONLY) {
                         desktop->setToolboxFocusTo ("altx-spiral");
                         ret = TRUE;
                     }
                     break;
-                case GDK_Escape:
+                case GDK_KEY_Escape:
                 	if (dragging) {
                 		dragging = false;
                 		sp_event_context_discard_delayed_snap_event(event_context);
@@ -355,7 +421,7 @@ sp_spiral_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                 	}
                 	break;
 
-                case GDK_space:
+                case GDK_KEY_space:
                     if (dragging) {
                         sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
                                               event->button.time);
@@ -375,14 +441,14 @@ sp_spiral_context_root_handler(SPEventContext *event_context, GdkEvent *event)
             break;
         case GDK_KEY_RELEASE:
             switch (get_group0_keyval(&event->key)) {
-                case GDK_Alt_L:
-                case GDK_Alt_R:
-                case GDK_Control_L:
-                case GDK_Control_R:
-                case GDK_Shift_L:
-                case GDK_Shift_R:
-                case GDK_Meta_L:  // Meta is when you press Shift+Alt
-                case GDK_Meta_R:
+                case GDK_KEY_Alt_L:
+                case GDK_KEY_Alt_R:
+                case GDK_KEY_Control_L:
+                case GDK_KEY_Control_R:
+                case GDK_KEY_Shift_L:
+                case GDK_KEY_Shift_R:
+                case GDK_KEY_Meta_L:  // Meta is when you press Shift+Alt
+                case GDK_KEY_Meta_R:
                     event_context->defaultMessageContext()->clear();
                     break;
                 default:
diff --git a/src/star-context.cpp b/src/star-context.cpp
index 4156384d5..226721cfc 100644
--- a/src/star-context.cpp
+++ b/src/star-context.cpp
@@ -49,6 +49,72 @@
 
 #include "star-context.h"
 
+#if !GTK_CHECK_VERSION(2,22,0)
+#define GDK_KEY_Up 0xff52
+#define GDK_KEY_KP_Up 0xff97
+#define GDK_KEY_Down 0xff54
+#define GDK_KEY_KP_Down 0xff99
+#define GDK_KEY_Left 0xff51
+#define GDK_KEY_KP_Left 0xff96
+#define GDK_KEY_Right 0xff53
+#define GDK_KEY_KP_Right 0xff98
+#define GDK_KEY_Home 0xff50
+#define GDK_KEY_KP_Home 0xff95
+#define GDK_KEY_End 0xff57
+#define GDK_KEY_KP_End 0xff9c
+#define GDK_KEY_a 0x061
+#define GDK_KEY_A 0x041
+#define GDK_KEY_g 0x067
+#define GDK_KEY_G 0x047
+#define GDK_KEY_l 0x06c
+#define GDK_KEY_L 0x04c
+#define GDK_KEY_r 0x072
+#define GDK_KEY_R 0x052
+#define GDK_KEY_s 0x073
+#define GDK_KEY_S 0x053
+#define GDK_KEY_u 0x075
+#define GDK_KEY_U 0x055
+#define GDK_KEY_x 0x078
+#define GDK_KEY_X 0x058
+#define GDK_KEY_z 0x07a
+#define GDK_KEY_Z 0x05a
+#define GDK_KEY_Escape 0xff1b
+#define GDK_KEY_Control_L 0xffe3
+#define GDK_KEY_Control_R 0xffe4
+#define GDK_KEY_Alt_L 0xffe9
+#define GDK_KEY_Alt_R 0xffea
+#define GDK_KEY_Shift_L 0xffe1
+#define GDK_KEY_Shift_R 0xffe2
+#define GDK_KEY_Meta_L 0xffe7
+#define GDK_KEY_Meta_R 0xffe8
+#define GDK_KEY_KP_0 0xffb0
+#define GDK_KEY_KP_1 0xffb1
+#define GDK_KEY_KP_2 0xffb2
+#define GDK_KEY_KP_3 0xffb3
+#define GDK_KEY_KP_4 0xffb4
+#define GDK_KEY_KP_5 0xffb5
+#define GDK_KEY_KP_6 0xffb6
+#define GDK_KEY_KP_7 0xffb7
+#define GDK_KEY_KP_8 0xffb8
+#define GDK_KEY_KP_9 0xffb9
+#define GDK_KEY_Insert 0xff63
+#define GDK_KEY_KP_Insert 0xff9e
+#define GDK_KEY_Delete 0xffff
+#define GDK_KEY_KP_Delete 0xff9f
+#define GDK_KEY_BackSpace 0xff08
+#define GDK_KEY_Return 0xff0d
+#define GDK_KEY_KP_Enter 0xff8d
+#define GDK_KEY_space 0x020
+#define GDK_KEY_Tab 0xff09
+#define GDK_KEY_ISO_Left_Tab 0xfe20
+#define GDK_KEY_bracketleft 0x05b
+#define GDK_KEY_bracketright 0x05d
+#define GDK_KEY_less 0x03c
+#define GDK_KEY_greater 0x03e
+#define GDK_KEY_comma 0x02c
+#define GDK_KEY_period 0x02e
+#endif
+
 using Inkscape::DocumentUndo;
 
 static void sp_star_context_class_init (SPStarContextClass * klass);
@@ -334,34 +400,34 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent
         break;
     case GDK_KEY_PRESS:
         switch (get_group0_keyval(&event->key)) {
-        case GDK_Alt_R:
-        case GDK_Control_L:
-        case GDK_Control_R:
-        case GDK_Shift_L:
-        case GDK_Shift_R:
-        case GDK_Meta_L:  // Meta is when you press Shift+Alt (at least on my machine)
-        case GDK_Meta_R:
+        case GDK_KEY_Alt_R:
+        case GDK_KEY_Control_L:
+        case GDK_KEY_Control_R:
+        case GDK_KEY_Shift_L:
+        case GDK_KEY_Shift_R:
+        case GDK_KEY_Meta_L:  // Meta is when you press Shift+Alt (at least on my machine)
+        case GDK_KEY_Meta_R:
             sp_event_show_modifier_tip(event_context->defaultMessageContext(), event,
                                        _("<b>Ctrl</b>: snap angle; keep rays radial"),
                                        NULL,
                                        NULL);
             break;
-        case GDK_Up:
-        case GDK_Down:
-        case GDK_KP_Up:
-        case GDK_KP_Down:
+        case GDK_KEY_Up:
+        case GDK_KEY_Down:
+        case GDK_KEY_KP_Up:
+        case GDK_KEY_KP_Down:
             // prevent the zoom field from activation
             if (!MOD__CTRL_ONLY)
                 ret = TRUE;
             break;
-        case GDK_x:
-        case GDK_X:
+        case GDK_KEY_x:
+        case GDK_KEY_X:
             if (MOD__ALT_ONLY) {
                 desktop->setToolboxFocusTo ("altx-star");
                 ret = TRUE;
             }
             break;
-        case GDK_Escape:
+        case GDK_KEY_Escape:
         	if (dragging) {
         		dragging = false;
         		sp_event_context_discard_delayed_snap_event(event_context);
@@ -370,7 +436,7 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent
         		ret = TRUE;
         	}
         	break;
-        case GDK_space:
+        case GDK_KEY_space:
             if (dragging) {
                 sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
                                       event->button.time);
@@ -390,14 +456,14 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent
         break;
     case GDK_KEY_RELEASE:
         switch (get_group0_keyval (&event->key)) {
-        case GDK_Alt_L:
-        case GDK_Alt_R:
-        case GDK_Control_L:
-        case GDK_Control_R:
-        case GDK_Shift_L:
-        case GDK_Shift_R:
-        case GDK_Meta_L:  // Meta is when you press Shift+Alt
-        case GDK_Meta_R:
+        case GDK_KEY_Alt_L:
+        case GDK_KEY_Alt_R:
+        case GDK_KEY_Control_L:
+        case GDK_KEY_Control_R:
+        case GDK_KEY_Shift_L:
+        case GDK_KEY_Shift_R:
+        case GDK_KEY_Meta_L:  // Meta is when you press Shift+Alt
+        case GDK_KEY_Meta_R:
             event_context->defaultMessageContext()->clear();
             break;
         default:
diff --git a/src/ui/tool/event-utils.cpp b/src/ui/tool/event-utils.cpp
index f71f0ab12..9d4b3e8e7 100644
--- a/src/ui/tool/event-utils.cpp
+++ b/src/ui/tool/event-utils.cpp
@@ -14,6 +14,72 @@
 #include "display/sp-canvas.h"
 #include "ui/tool/event-utils.h"
 
+#if !GTK_CHECK_VERSION(2,22,0)
+#define GDK_KEY_Up 0xff52
+#define GDK_KEY_KP_Up 0xff97
+#define GDK_KEY_Down 0xff54
+#define GDK_KEY_KP_Down 0xff99
+#define GDK_KEY_Left 0xff51
+#define GDK_KEY_KP_Left 0xff96
+#define GDK_KEY_Right 0xff53
+#define GDK_KEY_KP_Right 0xff98
+#define GDK_KEY_Home 0xff50
+#define GDK_KEY_KP_Home 0xff95
+#define GDK_KEY_End 0xff57
+#define GDK_KEY_KP_End 0xff9c
+#define GDK_KEY_a 0x061
+#define GDK_KEY_A 0x041
+#define GDK_KEY_g 0x067
+#define GDK_KEY_G 0x047
+#define GDK_KEY_l 0x06c
+#define GDK_KEY_L 0x04c
+#define GDK_KEY_r 0x072
+#define GDK_KEY_R 0x052
+#define GDK_KEY_s 0x073
+#define GDK_KEY_S 0x053
+#define GDK_KEY_u 0x075
+#define GDK_KEY_U 0x055
+#define GDK_KEY_x 0x078
+#define GDK_KEY_X 0x058
+#define GDK_KEY_z 0x07a
+#define GDK_KEY_Z 0x05a
+#define GDK_KEY_Escape 0xff1b
+#define GDK_KEY_Control_L 0xffe3
+#define GDK_KEY_Control_R 0xffe4
+#define GDK_KEY_Alt_L 0xffe9
+#define GDK_KEY_Alt_R 0xffea
+#define GDK_KEY_Shift_L 0xffe1
+#define GDK_KEY_Shift_R 0xffe2
+#define GDK_KEY_Meta_L 0xffe7
+#define GDK_KEY_Meta_R 0xffe8
+#define GDK_KEY_KP_0 0xffb0
+#define GDK_KEY_KP_1 0xffb1
+#define GDK_KEY_KP_2 0xffb2
+#define GDK_KEY_KP_3 0xffb3
+#define GDK_KEY_KP_4 0xffb4
+#define GDK_KEY_KP_5 0xffb5
+#define GDK_KEY_KP_6 0xffb6
+#define GDK_KEY_KP_7 0xffb7
+#define GDK_KEY_KP_8 0xffb8
+#define GDK_KEY_KP_9 0xffb9
+#define GDK_KEY_Insert 0xff63
+#define GDK_KEY_KP_Insert 0xff9e
+#define GDK_KEY_Delete 0xffff
+#define GDK_KEY_KP_Delete 0xff9f
+#define GDK_KEY_BackSpace 0xff08
+#define GDK_KEY_Return 0xff0d
+#define GDK_KEY_KP_Enter 0xff8d
+#define GDK_KEY_space 0x020
+#define GDK_KEY_Tab 0xff09
+#define GDK_KEY_ISO_Left_Tab 0xfe20
+#define GDK_KEY_bracketleft 0x05b
+#define GDK_KEY_bracketright 0x05d
+#define GDK_KEY_less 0x03c
+#define GDK_KEY_greater 0x03e
+#define GDK_KEY_comma 0x02c
+#define GDK_KEY_period 0x02e
+#endif
+
 namespace Inkscape {
 namespace UI {
 
@@ -107,16 +173,16 @@ unsigned state_after_event(GdkEvent *event)
     case GDK_KEY_PRESS:
         state = event->key.state;
         switch(shortcut_key(event->key)) {
-        case GDK_Shift_L:
-        case GDK_Shift_R:
+        case GDK_KEY_Shift_L:
+        case GDK_KEY_Shift_R:
             state |= GDK_SHIFT_MASK;
             break;
-        case GDK_Control_L:
-        case GDK_Control_R:
+        case GDK_KEY_Control_L:
+        case GDK_KEY_Control_R:
             state |= GDK_CONTROL_MASK;
             break;
-        case GDK_Alt_L:
-        case GDK_Alt_R:
+        case GDK_KEY_Alt_L:
+        case GDK_KEY_Alt_R:
             state |= GDK_MOD1_MASK;
             break;
         default: break;
@@ -125,16 +191,16 @@ unsigned state_after_event(GdkEvent *event)
     case GDK_KEY_RELEASE:
         state = event->key.state;
         switch(shortcut_key(event->key)) {
-        case GDK_Shift_L:
-        case GDK_Shift_R:
+        case GDK_KEY_Shift_L:
+        case GDK_KEY_Shift_R:
             state &= ~GDK_SHIFT_MASK;
             break;
-        case GDK_Control_L:
-        case GDK_Control_R:
+        case GDK_KEY_Control_L:
+        case GDK_KEY_Control_R:
             state &= ~GDK_CONTROL_MASK;
             break;
-        case GDK_Alt_L:
-        case GDK_Alt_R:
+        case GDK_KEY_Alt_L:
+        case GDK_KEY_Alt_R:
             state &= ~GDK_MOD1_MASK;
             break;
         default: break;
diff --git a/src/ui/tool/modifier-tracker.cpp b/src/ui/tool/modifier-tracker.cpp
index bbef0d469..ea247d4fb 100644
--- a/src/ui/tool/modifier-tracker.cpp
+++ b/src/ui/tool/modifier-tracker.cpp
@@ -12,6 +12,73 @@
 #include <gdk/gdkkeysyms.h>
 #include "ui/tool/event-utils.h"
 #include "ui/tool/modifier-tracker.h"
+#include <gtk/gtk.h>
+
+#if !GTK_CHECK_VERSION(2,22,0)
+#define GDK_KEY_Up 0xff52
+#define GDK_KEY_KP_Up 0xff97
+#define GDK_KEY_Down 0xff54
+#define GDK_KEY_KP_Down 0xff99
+#define GDK_KEY_Left 0xff51
+#define GDK_KEY_KP_Left 0xff96
+#define GDK_KEY_Right 0xff53
+#define GDK_KEY_KP_Right 0xff98
+#define GDK_KEY_Home 0xff50
+#define GDK_KEY_KP_Home 0xff95
+#define GDK_KEY_End 0xff57
+#define GDK_KEY_KP_End 0xff9c
+#define GDK_KEY_a 0x061
+#define GDK_KEY_A 0x041
+#define GDK_KEY_g 0x067
+#define GDK_KEY_G 0x047
+#define GDK_KEY_l 0x06c
+#define GDK_KEY_L 0x04c
+#define GDK_KEY_r 0x072
+#define GDK_KEY_R 0x052
+#define GDK_KEY_s 0x073
+#define GDK_KEY_S 0x053
+#define GDK_KEY_u 0x075
+#define GDK_KEY_U 0x055
+#define GDK_KEY_x 0x078
+#define GDK_KEY_X 0x058
+#define GDK_KEY_z 0x07a
+#define GDK_KEY_Z 0x05a
+#define GDK_KEY_Escape 0xff1b
+#define GDK_KEY_Control_L 0xffe3
+#define GDK_KEY_Control_R 0xffe4
+#define GDK_KEY_Alt_L 0xffe9
+#define GDK_KEY_Alt_R 0xffea
+#define GDK_KEY_Shift_L 0xffe1
+#define GDK_KEY_Shift_R 0xffe2
+#define GDK_KEY_Meta_L 0xffe7
+#define GDK_KEY_Meta_R 0xffe8
+#define GDK_KEY_KP_0 0xffb0
+#define GDK_KEY_KP_1 0xffb1
+#define GDK_KEY_KP_2 0xffb2
+#define GDK_KEY_KP_3 0xffb3
+#define GDK_KEY_KP_4 0xffb4
+#define GDK_KEY_KP_5 0xffb5
+#define GDK_KEY_KP_6 0xffb6
+#define GDK_KEY_KP_7 0xffb7
+#define GDK_KEY_KP_8 0xffb8
+#define GDK_KEY_KP_9 0xffb9
+#define GDK_KEY_Insert 0xff63
+#define GDK_KEY_KP_Insert 0xff9e
+#define GDK_KEY_Delete 0xffff
+#define GDK_KEY_KP_Delete 0xff9f
+#define GDK_KEY_BackSpace 0xff08
+#define GDK_KEY_Return 0xff0d
+#define GDK_KEY_KP_Enter 0xff8d
+#define GDK_KEY_space 0x020
+#define GDK_KEY_Tab 0xff09
+#define GDK_KEY_ISO_Left_Tab 0xfe20
+#define GDK_KEY_bracketleft 0x05b
+#define GDK_KEY_bracketright 0x05d
+#define GDK_KEY_less 0x03c
+#define GDK_KEY_greater 0x03e
+#define GDK_KEY_comma 0x02c
+#define GDK_KEY_period 0x02e
+#endif
 
 namespace Inkscape {
 namespace UI {
@@ -30,44 +97,44 @@ bool ModifierTracker::event(GdkEvent *event)
     switch (event->type) {
     case GDK_KEY_PRESS:
         switch (shortcut_key(event->key)) {
-        case GDK_Shift_L:
+        case GDK_KEY_Shift_L:
             _left_shift = true;
             break;
-        case GDK_Shift_R:
+        case GDK_KEY_Shift_R:
             _right_shift = true;
             break;
-        case GDK_Control_L:
+        case GDK_KEY_Control_L:
             _left_ctrl = true;
             break;
-        case GDK_Control_R:
+        case GDK_KEY_Control_R:
             _right_ctrl = true;
             break;
-        case GDK_Alt_L:
+        case GDK_KEY_Alt_L:
             _left_alt = true;
             break;
-        case GDK_Alt_R:
+        case GDK_KEY_Alt_R:
             _right_alt = true;
             break;
         }
         break;
     case GDK_KEY_RELEASE:
         switch (shortcut_key(event->key)) {
-        case GDK_Shift_L:
+        case GDK_KEY_Shift_L:
             _left_shift = false;
             break;
-        case GDK_Shift_R:
+        case GDK_KEY_Shift_R:
             _right_shift = false;
             break;
-        case GDK_Control_L:
+        case GDK_KEY_Control_L:
             _left_ctrl = false;
             break;
-        case GDK_Control_R:
+        case GDK_KEY_Control_R:
             _right_ctrl = false;
             break;
-        case GDK_Alt_L:
+        case GDK_KEY_Alt_L:
             _left_alt = false;
             break;
-        case GDK_Alt_R:
+        case GDK_KEY_Alt_R:
             _right_alt = false;
             break;
         }