GDK_KEY_* was introduced in Gtk+ 2.22

6 files changed, 22 insertions, 37 deletions

diff --git a/gsearchtool/gsearchtool-callbacks.c b/gsearchtool/gsearchtool-callbacks.c
index a14c4896..464b6d5c 100644
--- a/gsearchtool/gsearchtool-callbacks.c
+++ b/gsearchtool/gsearchtool-callbacks.c
@@ -40,9 +40,6 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gdk/gdkkeysyms-compat.h>
-#endif
 
 #include "gsearchtool.h"
 #include "gsearchtool-callbacks.h"
@@ -965,15 +962,15 @@ file_key_press_event_cb (GtkWidget * widget,
                          GdkEventKey * event,
                          gpointer data)
 {
-	if (event->keyval == GDK_space  ||
-	    event->keyval == GDK_Return ||
-	    event->keyval == GDK_KP_Enter) {
+	if (event->keyval == GDK_KEY_space  ||
+	    event->keyval == GDK_KEY_Return ||
+	    event->keyval == GDK_KEY_KP_Enter) {
 		if (event->state != GDK_CONTROL_MASK) {
 			open_file_cb ((GtkMenuItem *) NULL, data);
 			return TRUE;
 		}
 	}
-	else if (event->keyval == GDK_Delete) {
+	else if (event->keyval == GDK_KEY_Delete) {
 		move_to_trash_cb ((GtkAction *) NULL, data);
 		return TRUE;
 	}
@@ -1837,7 +1834,7 @@ key_press_cb (GtkWidget * widget,
 
 	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
 
-	if (event->keyval == GDK_Escape) {
+	if (event->keyval == GDK_KEY_Escape) {
 		if (gsearch->command_details->command_status == RUNNING) {
 			click_stop_cb (widget, data);
 		}
@@ -1845,7 +1842,7 @@ key_press_cb (GtkWidget * widget,
 			quit_cb (widget, (GdkEvent *) NULL, data);
 		}
 	}
-	else if (event->keyval == GDK_F10) {
+	else if (event->keyval == GDK_KEY_F10) {
 		if (event->state & GDK_SHIFT_MASK) {
 			gboolean no_files_found = FALSE;
 			GtkTreeModel * model;
diff --git a/logview/logview-findbar.c b/logview/logview-findbar.c
index 947df4cb..9fbf9cb4 100644
--- a/logview/logview-findbar.c
+++ b/logview/logview-findbar.c
@@ -22,9 +22,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gdk/gdkkeysyms-compat.h>
-#endif
 
 #include "logview-findbar.h"
 
@@ -123,7 +120,7 @@ entry_key_press_event_cb (GtkWidget *entry,
 {
   LogviewFindbar *findbar = user_data;
 
-  if (event->keyval == GDK_Escape) {
+  if (event->keyval == GDK_KEY_Escape) {
     g_signal_emit (findbar, signals[CLOSE], 0);
     return TRUE;
   }
diff --git a/logview/logview-window.c b/logview/logview-window.c
index 0a32521d..b192c291 100644
--- a/logview/logview-window.c
+++ b/logview/logview-window.c
@@ -1120,9 +1120,9 @@ static const struct {
   GdkModifierType modifier;
   const gchar *action;
 } extra_keybindings [] = {
-  { GDK_KP_Add,      GDK_CONTROL_MASK, "ViewZoomIn" },
-  { GDK_KP_Subtract, GDK_CONTROL_MASK, "ViewZoomOut" },
-  { GDK_KP_0,        GDK_CONTROL_MASK, "ViewZoom100" }
+  { GDK_KEY_KP_Add,      GDK_CONTROL_MASK, "ViewZoomIn" },
+  { GDK_KEY_KP_Subtract, GDK_CONTROL_MASK, "ViewZoomOut" },
+  { GDK_KEY_KP_0,        GDK_CONTROL_MASK, "ViewZoom100" }
 };
 
 static gboolean
diff --git a/mate-dictionary/libgdict/gdict-defbox.c b/mate-dictionary/libgdict/gdict-defbox.c
index fc7697a5..86d4427f 100644
--- a/mate-dictionary/libgdict/gdict-defbox.c
+++ b/mate-dictionary/libgdict/gdict-defbox.c
@@ -40,9 +40,6 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gdk/gdkkeysyms-compat.h>
-#endif
 #include <glib/gi18n-lib.h>
 
 #include "gdict-defbox.h"
@@ -1891,19 +1888,19 @@ gdict_defbox_class_init (GdictDefboxClass *klass)
 
   binding_set = gtk_binding_set_by_class (klass);
   gtk_binding_entry_add_signal (binding_set,
-  			        GDK_f, GDK_CONTROL_MASK,
+  			        GDK_KEY_f, GDK_CONTROL_MASK,
   			        "show-find",
   			        0);
   gtk_binding_entry_add_signal (binding_set,
-  			        GDK_g, GDK_CONTROL_MASK,
+  			        GDK_KEY_g, GDK_CONTROL_MASK,
   			        "find-next",
   			        0);
   gtk_binding_entry_add_signal (binding_set,
-  				GDK_g, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+  				GDK_KEY_g, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
   				"find-previous",
   				0);
   gtk_binding_entry_add_signal (binding_set,
-  			        GDK_Escape, 0,
+  			        GDK_KEY_Escape, 0,
   			        "hide-find",
   			        0);
 
diff --git a/mate-dictionary/src/gdict-applet.c b/mate-dictionary/src/gdict-applet.c
index b29b8cd8..ff417997 100644
--- a/mate-dictionary/src/gdict-applet.c
+++ b/mate-dictionary/src/gdict-applet.c
@@ -29,9 +29,6 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gdk/gdkkeysyms-compat.h>
-#endif
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "gdict-applet.h"
@@ -281,14 +278,14 @@ window_key_press_event_cb (GtkWidget   *widget,
 {
   GdictApplet *applet = GDICT_APPLET (user_data);
   
-  if (event->keyval == GDK_Escape)
+  if (event->keyval == GDK_KEY_Escape)
     {
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (applet->priv->toggle), FALSE);
       gtk_toggle_button_toggled (GTK_TOGGLE_BUTTON (applet->priv->toggle));
 
       return TRUE;
     }
-  else if ((event->keyval == GDK_l) &&
+  else if ((event->keyval == GDK_KEY_l) &&
 	   (event->state & GDK_CONTROL_MASK))
     {
       gtk_widget_grab_focus (applet->priv->entry);
@@ -452,7 +449,7 @@ gdict_applet_entry_key_press_cb (GtkWidget   *widget,
 {
   GdictAppletPrivate *priv = GDICT_APPLET (user_data)->priv;
   
-  if (event->keyval == GDK_Escape)
+  if (event->keyval == GDK_KEY_Escape)
     {
       if (priv->is_window_showing)
 	{
@@ -462,7 +459,7 @@ gdict_applet_entry_key_press_cb (GtkWidget   *widget,
 	  return TRUE;
 	}
     }
-  else if (event->keyval == GDK_Tab)
+  else if (event->keyval == GDK_KEY_Tab)
     {
       if (priv->is_window_showing)
 	gtk_widget_grab_focus (priv->defbox);
diff --git a/mate-dictionary/src/gdict-sidebar.c b/mate-dictionary/src/gdict-sidebar.c
index 8da6775e..87658a70 100644
--- a/mate-dictionary/src/gdict-sidebar.c
+++ b/mate-dictionary/src/gdict-sidebar.c
@@ -32,9 +32,6 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gdk/gdkkeysyms-compat.h>
-#endif
 #include <glib/gi18n.h>
 
 #include "gdict-sidebar.h"
@@ -203,10 +200,10 @@ gdict_sidebar_select_key_press_cb (GtkWidget   *widget,
 {
   GdictSidebar *sidebar = GDICT_SIDEBAR (user_data);
 
-  if (event->keyval == GDK_space ||
-      event->keyval == GDK_KP_Space ||
-      event->keyval == GDK_Return ||
-      event->keyval == GDK_KP_Enter)
+  if (event->keyval == GDK_KEY_space ||
+      event->keyval == GDK_KEY_KP_Space ||
+      event->keyval == GDK_KEY_Return ||
+      event->keyval == GDK_KEY_KP_Enter)
     {
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
       gtk_menu_popup (GTK_MENU (sidebar->priv->menu),