From bd7602081c4cc56f10cbe46846462daf9e3e2753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 13 Sep 2011 14:59:31 +0100 Subject: [PATCH 1/6] utils: Replace GDK_ with GDK_KEY_ --- util/show-contour.c | 4 ++-- util/show-edges.c | 10 +++++----- util/show-polygon.c | 4 ++-- util/show-traps.c | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/util/show-contour.c b/util/show-contour.c index d5c52a0..72d9d9a 100644 --- a/util/show-contour.c +++ b/util/show-contour.c @@ -397,8 +397,8 @@ static gboolean trap_view_key_press (GtkWidget *w, GdkEventKey *ev) { switch (ev->keyval) { - case GDK_Escape: - case GDK_Q: + case GDK_KEY_Escape: + case GDK_KEY_Q: gtk_main_quit (); break; } diff --git a/util/show-edges.c b/util/show-edges.c index 57df57c..8ae44a2 100644 --- a/util/show-edges.c +++ b/util/show-edges.c @@ -757,26 +757,26 @@ trap_view_key_press (GtkWidget *w, GdkEventKey *ev) TrapView *self = (TrapView *) w; switch (ev->keyval) { - case GDK_BackSpace: + case GDK_KEY_BackSpace: trap_view_group_foreach (self->group_head, (GFunc) trap_view_back, NULL); break; - case GDK_space: + case GDK_KEY_space: trap_view_group_foreach (self->group_head, (GFunc) trap_view_advance, NULL); break; - case GDK_Return: + case GDK_KEY_Return: trap_view_group_foreach (self->group_head, (GFunc) trap_view_advance, NULL); break; - case GDK_Escape: - case GDK_Q: + case GDK_KEY_Escape: + case GDK_KEY_Q: gtk_main_quit (); break; } diff --git a/util/show-polygon.c b/util/show-polygon.c index 131679e..f59e8ef 100644 --- a/util/show-polygon.c +++ b/util/show-polygon.c @@ -315,8 +315,8 @@ static gboolean polygon_view_key_press (GtkWidget *w, GdkEventKey *ev) { switch (ev->keyval) { - case GDK_Escape: - case GDK_Q: + case GDK_KEY_Escape: + case GDK_KEY_Q: gtk_main_quit (); break; } diff --git a/util/show-traps.c b/util/show-traps.c index 040c824..7badad5 100644 --- a/util/show-traps.c +++ b/util/show-traps.c @@ -753,26 +753,26 @@ trap_view_key_press (GtkWidget *w, GdkEventKey *ev) TrapView *self = (TrapView *) w; switch (ev->keyval) { - case GDK_BackSpace: + case GDK_KEY_BackSpace: trap_view_group_foreach (self->group_head, (GFunc) trap_view_back, NULL); break; - case GDK_space: + case GDK_KEY_space: trap_view_group_foreach (self->group_head, (GFunc) trap_view_advance, NULL); break; - case GDK_Return: + case GDK_KEY_Return: trap_view_group_foreach (self->group_head, (GFunc) trap_view_advance, NULL); break; - case GDK_Escape: - case GDK_Q: + case GDK_KEY_Escape: + case GDK_KEY_Q: gtk_main_quit (); break; } -- 1.7.5.4