Refactoring:GTK: use GDK_KEY for keys instead of GDK_

https://developer.gnome.org/gtk3/stable/gtk-migrating-2-to-3.html

Signed-off-by: David Heidelberg <david@ixit.cz>

3 files changed, 32 insertions, 32 deletions

diff --git a/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
index 35896791b..895a61fea 100644
--- a/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
+++ b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
@@ -27,7 +27,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <cairo.h>
 #include <locale.h> /* For WIN32 */
-#if !defined(GDK_Book) || !defined(GDK_Calendar)
+#if !defined(GDK_KEY_Book) || !defined(GDK_Book) || !defined(GDK_Calendar)
 #include <X11/XF86keysym.h>
 #endif
 #ifdef HAVE_IMLIB2
@@ -51,11 +51,11 @@
 #include "navit.h"
 #include <errno.h>
 
-#ifndef GDK_Book
-#define GDK_Book XF86XK_Book
+#ifndef GDK_KEY_Book
+#define GDK_KEY_Book XF86XK_Book
 #endif
-#ifndef GDK_Calendar
-#define GDK_Calendar XF86XK_Calendar
+#ifndef GDK_KEY_Calendar
+#define GDK_KEY_Calendar XF86XK_Calendar
 #endif
 
 
@@ -735,62 +735,62 @@ static gint keypress(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
     key[len]='\0';
 
     switch (event->keyval) {
-    case GDK_Up:
+    case GDK_KEY_Up:
         key[0]=NAVIT_KEY_UP;
         key[1]='\0';
         break;
-    case GDK_Down:
+    case GDK_KEY_Down:
         key[0]=NAVIT_KEY_DOWN;
         key[1]='\0';
         break;
-    case GDK_Left:
+    case GDK_KEY_Left:
         key[0]=NAVIT_KEY_LEFT;
         key[1]='\0';
         break;
-    case GDK_Right:
+    case GDK_KEY_Right:
         key[0]=NAVIT_KEY_RIGHT;
         key[1]='\0';
         break;
-    case GDK_BackSpace:
+    case GDK_KEY_BackSpace:
         key[0]=NAVIT_KEY_BACKSPACE;
         key[1]='\0';
         break;
-    case GDK_Tab:
+    case GDK_KEY_Tab:
         key[0]='\t';
         key[1]='\0';
         break;
-    case GDK_Delete:
+    case GDK_KEY_Delete:
         key[0]=NAVIT_KEY_DELETE;
         key[1]='\0';
         break;
-    case GDK_Escape:
+    case GDK_KEY_Escape:
         key[0]=NAVIT_KEY_BACK;
         key[1]='\0';
         break;
-    case GDK_Return:
-    case GDK_KP_Enter:
+    case GDK_KEY_Return:
+    case GDK_KEY_KP_Enter:
         key[0]=NAVIT_KEY_RETURN;
         key[1]='\0';
         break;
-    case GDK_Book:
+    case GDK_KEY_Book:
 #ifdef USE_HILDON
-    case GDK_F7:
+    case GDK_KEY_F7:
 #endif
         key[0]=NAVIT_KEY_ZOOM_IN;
         key[1]='\0';
         break;
-    case GDK_Calendar:
+    case GDK_KEY_Calendar:
 #ifdef USE_HILDON
-    case GDK_F8:
+    case GDK_KEY_F8:
 #endif
         key[0]=NAVIT_KEY_ZOOM_OUT;
         key[1]='\0';
         break;
-    case GDK_Page_Up:
+    case GDK_KEY_Page_Up:
         key[0]=NAVIT_KEY_PAGE_UP;
         key[1]='\0';
         break;
-    case GDK_Page_Down:
+    case GDK_KEY_Page_Down:
         key[0]=NAVIT_KEY_PAGE_DOWN;
         key[1]='\0';
         break;
diff --git a/navit/gui/gtk/datawindow.c b/navit/gui/gtk/datawindow.c
index afe977dbc..4d8d6e9bf 100644
--- a/navit/gui/gtk/datawindow.c
+++ b/navit/gui/gtk/datawindow.c
@@ -153,7 +153,7 @@ void gui_gtk_datawindow_set_button(struct datawindow_priv *this_, GtkWidget *btn
 static gboolean keypress(GtkWidget *widget, GdkEventKey *event, struct datawindow_priv *win) {
     if (event->type != GDK_KEY_PRESS)
         return FALSE;
-    if (event->keyval == GDK_Cancel) {
+    if (event->keyval == GDK_KEY_Cancel) {
         gui_gtk_datawindow_delete(widget, (GdkEvent *)event, win);
         gtk_widget_destroy(win->window);
     }
diff --git a/navit/gui/gtk/gui_gtk_window.c b/navit/gui/gtk/gui_gtk_window.c
index 008659c44..aa510b374 100644
--- a/navit/gui/gtk/gui_gtk_window.c
+++ b/navit/gui/gtk/gui_gtk_window.c
@@ -23,7 +23,7 @@
 #include <math.h>
 #include <locale.h>
 #include <gdk/gdkkeysyms.h>
-#if !defined(GDK_Book) || !defined(GDK_Calendar)
+#if !defined(GDK_KEY_Book) || !defined(GDK_Book) || !defined(GDK_Calendar)
 #include <X11/XF86keysym.h>
 #endif
 #include <gtk/gtk.h>
@@ -60,17 +60,17 @@
 #define KEY_RIGHT HILDON_HARDKEY_RIGHT
 #else
 #ifndef GDK_Book
-#define GDK_Book XF86XK_Book
+#define GDK_KEY_Book XF86XK_Book
 #endif
 #ifndef GDK_Calendar
-#define GDK_Calendar XF86XK_Calendar
+#define GDK_KEY_Calendar XF86XK_Calendar
 #endif
-#define KEY_ZOOM_IN GDK_Book
-#define KEY_ZOOM_OUT GDK_Calendar
-#define KEY_UP GDK_Up
-#define KEY_DOWN GDK_Down
-#define KEY_LEFT GDK_Left
-#define KEY_RIGHT GDK_Right
+#define KEY_ZOOM_IN GDK_KEY_Book
+#define KEY_ZOOM_OUT GDK_KEY_Calendar
+#define KEY_UP GDK_KEY_Up
+#define KEY_DOWN GDK_KEY_Down
+#define KEY_LEFT GDK_KEY_Left
+#define KEY_RIGHT GDK_KEY_Right
 #endif
 
 GdkPixbuf *geticon(const char *name);
@@ -88,7 +88,7 @@ static gboolean keypress(GtkWidget *widget, GdkEventKey *event, struct gui_priv
     dbg(lvl_debug,"keypress 0x%x", event->keyval);
     transform_get_size(navit_get_trans(this->nav), &w, &h);
     switch (event->keyval) {
-    case GDK_KP_Enter:
+    case GDK_KEY_KP_Enter:
         gtk_menu_shell_select_first(GTK_MENU_SHELL(this->menubar), TRUE);
         break;
     case KEY_UP: