Replace deprecated GDK key symbols

(bzr r11194)

1 files changed, 89 insertions, 34 deletions

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);