Get rid of remaining deprecated GDK Key symbols

(bzr r11250)

1 files changed, 120 insertions, 28 deletions

diff --git a/src/spray-context.cpp b/src/spray-context.cpp
index 89da66b8f..b10c486c7 100644
--- a/src/spray-context.cpp
+++ b/src/spray-context.cpp
@@ -72,6 +72,98 @@
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
 
+#if !GTK_CHECK_VERSION(2,22,0)
+#define GDK_KEY_VoidSymbol 0xffffff
+#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_Page_Up 0xff55
+#define GDK_KEY_KP_Page_Up 0xff9a
+#define GDK_KEY_Page_Down 0xff56
+#define GDK_KEY_KP_Page_Down 0xff9b
+#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_d 0x064
+#define GDK_KEY_D 0x044
+#define GDK_KEY_g 0x067
+#define GDK_KEY_G 0x047
+#define GDK_KEY_j 0x06a
+#define GDK_KEY_J 0x04a
+#define GDK_KEY_k 0x06b
+#define GDK_KEY_K 0x04b
+#define GDK_KEY_l 0x06c
+#define GDK_KEY_L 0x04c
+#define GDK_KEY_q 0x071
+#define GDK_KEY_Q 0x051
+#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_w 0x077
+#define GDK_KEY_W 0x057
+#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_F1 0xffbe
+#define GDK_KEY_F2 0xffbf
+#define GDK_KEY_F3 0xffc0
+#define GDK_KEY_F4 0xffc1
+#define GDK_KEY_F5 0xffc2
+#define GDK_KEY_F6 0xffc3
+#define GDK_KEY_F7 0xffc4
+#define GDK_KEY_F8 0xffc5
+#define GDK_KEY_F9 0xffc6
+#define GDK_KEY_F10 0xffc7
+#define GDK_KEY_F11 0xffc8
+#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;
 using namespace std;
 
@@ -796,29 +888,29 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even
 
         case GDK_KEY_PRESS:
             switch (get_group0_keyval (&event->key)) {
-                case GDK_j:
-                case GDK_J:
+                case GDK_KEY_j:
+                case GDK_KEY_J:
                     if (MOD__SHIFT_ONLY) {
                         sp_spray_switch_mode(tc, SPRAY_MODE_COPY, MOD__SHIFT);
                         ret = TRUE;
                     }
                     break;
-                case GDK_k:
-                case GDK_K:
+                case GDK_KEY_k:
+                case GDK_KEY_K:
                     if (MOD__SHIFT_ONLY) {
                         sp_spray_switch_mode(tc, SPRAY_MODE_CLONE, MOD__SHIFT);
                         ret = TRUE;
                     }
                     break;
-                case GDK_l:
-                case GDK_L:
+                case GDK_KEY_l:
+                case GDK_KEY_L:
                     if (MOD__SHIFT_ONLY) {
                         sp_spray_switch_mode(tc, SPRAY_MODE_SINGLE_PATH, MOD__SHIFT);
                         ret = TRUE;
                     }
                     break;
-                case GDK_Up:
-                case GDK_KP_Up:
+                case GDK_KEY_Up:
+                case GDK_KEY_KP_Up:
                     if (!MOD__CTRL_ONLY) {
                         tc->population += 0.01;
                         if (tc->population > 1.0) {
@@ -828,8 +920,8 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even
                         ret = TRUE;
                     }
                     break;
-                case GDK_Down:
-                case GDK_KP_Down:
+                case GDK_KEY_Down:
+                case GDK_KEY_KP_Down:
                     if (!MOD__CTRL_ONLY) {
                         tc->population -= 0.01;
                         if (tc->population < 0.0) {
@@ -839,8 +931,8 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even
                         ret = TRUE;
                     }
                     break;
-                case GDK_Right:
-                case GDK_KP_Right:
+                case GDK_KEY_Right:
+                case GDK_KEY_KP_Right:
                     if (!MOD__CTRL_ONLY) {
                         tc->width += 0.01;
                         if (tc->width > 1.0) {
@@ -852,8 +944,8 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even
                         ret = TRUE;
                     }
                     break;
-                case GDK_Left:
-                case GDK_KP_Left:
+                case GDK_KEY_Left:
+                case GDK_KEY_KP_Left:
                     if (!MOD__CTRL_ONLY) {
                         tc->width -= 0.01;
                         if (tc->width < 0.01) {
@@ -864,33 +956,33 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even
                         ret = TRUE;
                     }
                     break;
-                case GDK_Home:
-                case GDK_KP_Home:
+                case GDK_KEY_Home:
+                case GDK_KEY_KP_Home:
                     tc->width = 0.01;
                     desktop->setToolboxAdjustmentValue("altx-spray", tc->width * 100);
                     sp_spray_update_area(tc);
                     ret = TRUE;
                     break;
-                case GDK_End:
-                case GDK_KP_End:
+                case GDK_KEY_End:
+                case GDK_KEY_KP_End:
                     tc->width = 1.0;
                     desktop->setToolboxAdjustmentValue("altx-spray", tc->width * 100);
                     sp_spray_update_area(tc);
                     ret = TRUE;
                     break;
-                case GDK_x:
-                case GDK_X:
+                case GDK_KEY_x:
+                case GDK_KEY_X:
                     if (MOD__ALT_ONLY) {
                         desktop->setToolboxFocusTo("altx-spray");
                         ret = TRUE;
                     }
                     break;
-                case GDK_Shift_L:
-                case GDK_Shift_R:
+                case GDK_KEY_Shift_L:
+                case GDK_KEY_Shift_R:
                     sp_spray_update_cursor(tc, true);
                     break;
-                case GDK_Control_L:
-                case GDK_Control_R:
+                case GDK_KEY_Control_L:
+                case GDK_KEY_Control_R:
                     break;
                 default:
                     break;
@@ -900,12 +992,12 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even
         case GDK_KEY_RELEASE: {
             Inkscape::Preferences *prefs = Inkscape::Preferences::get();
             switch (get_group0_keyval(&event->key)) {
-                case GDK_Shift_L:
-                case GDK_Shift_R:
+                case GDK_KEY_Shift_L:
+                case GDK_KEY_Shift_R:
                     sp_spray_update_cursor(tc, false);
                     break;
-                case GDK_Control_L:
-                case GDK_Control_R:
+                case GDK_KEY_Control_L:
+                case GDK_KEY_Control_R:
                     sp_spray_switch_mode (tc, prefs->getInt("/tools/spray/mode"), MOD__SHIFT);
                     tc->_message_context->clear();
                     break;