[ghex] Use GDK_KEY_* constants

[Kalev Lember <klember src gnome org>]

commit 0770099fb8a87a723aa44ce443247d5a36272147
Author: Kalev Lember <kalevlember gmail com>
Date:   Sun Jul 24 22:54:27 2011 +0300

    Use GDK_KEY_* constants
    
    Also bump the minumum required gtk+ version to 2.24.0.

 configure.ac    |    4 ++--
 src/chartable.c |    4 ++--
 src/converter.c |    2 +-
 src/gtkhex.c    |   34 +++++++++++++++++-----------------
 4 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index af456cc..4112381 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ AC_DEFINE_UNQUOTED(LIBGTKHEX_RELEASE_STRING, "$LIBGTKHEX_RELEASE_STRING",
                    [GtkHex library release string.])
 
 PKG_CHECK_MODULES(LIBGTKHEX,
-		  gtk+-2.0 >= 2.20.0	\
+		  gtk+-2.0 >= 2.24.0	\
 		  libbonobo-2.0		\
 		  atk >= 1.0.0)
 AC_SUBST(LIBGTKHEX_LIBS)
@@ -43,7 +43,7 @@ AC_SUBST(LIBGTKHEX_CFLAGS)
 
 PKG_CHECK_MODULES(GHEX,
 		  gio-2.0                       \
-		  gtk+-2.0 >= 2.20.0 		\
+		  gtk+-2.0 >= 2.24.0 		\
 		  gconf-2.0			\
 		  libbonoboui-2.0		\
 		  libgnomeprintui-2.2)
diff --git a/src/chartable.c b/src/chartable.c
index 0a78c19..ba9b6d0 100644
--- a/src/chartable.c
+++ b/src/chartable.c
@@ -114,7 +114,7 @@ static void hide_chartable_cb (GtkWidget *widget, GtkWidget *win)
 
 static gint char_table_key_press_cb (GtkWindow *w, GdkEventKey *e, gpointer data)
 {
-	if (e->keyval == GDK_Escape) {
+	if (e->keyval == GDK_KEY_Escape) {
 		hide_chartable_cb(NULL, GTK_WIDGET(w));
 		return TRUE;
 	}
@@ -125,7 +125,7 @@ static gint key_press_cb (GtkTreeView *treeview, GdkEventKey *e, gpointer data)
 {
 	GtkTreeModel *model = GTK_TREE_MODEL(data);
 
-	if(e->keyval == GDK_Return) {
+	if (e->keyval == GDK_KEY_Return) {
 		insert_char(treeview, model);
 		return TRUE;
 	}
diff --git a/src/converter.c b/src/converter.c
index 322db58..e13ffa5 100644
--- a/src/converter.c
+++ b/src/converter.c
@@ -210,7 +210,7 @@ converter_delete_event_cb(GtkWidget *widget, GdkEventAny *e, gpointer user_data)
 static gboolean
 conv_key_press_cb (GtkWidget *widget, GdkEventKey *e, gpointer user_data)
 {
-	if (e->keyval == GDK_Escape) {
+	if (e->keyval == GDK_KEY_Escape) {
 		converter_delete_event_cb(widget, (GdkEventAny *)e, user_data);
 		return TRUE;
 	}
diff --git a/src/gtkhex.c b/src/gtkhex.c
index 986bfd2..f085cca 100644
--- a/src/gtkhex.c
+++ b/src/gtkhex.c
@@ -1629,7 +1629,7 @@ static gboolean gtk_hex_key_press(GtkWidget *w, GdkEventKey *event) {
 		gh->selecting = TRUE;
 	}
 	switch(event->keyval) {
-	case GDK_BackSpace:
+	case GDK_KEY_BackSpace:
 		if(gh->cursor_pos > 0) {
 			hex_document_set_data(gh->document, gh->cursor_pos - 1,
 								  0, 1, NULL, TRUE);
@@ -1638,8 +1638,8 @@ static gboolean gtk_hex_key_press(GtkWidget *w, GdkEventKey *event) {
 			gtk_hex_set_cursor(gh, gh->cursor_pos - 1);
 		}
 		break;
-	case GDK_Tab:
-	case GDK_KP_Tab:
+	case GDK_KEY_Tab:
+	case GDK_KEY_KP_Tab:
 		if (gh->active_view == VIEW_ASCII) {
 			gh->active_view = VIEW_HEX;
 		}
@@ -1647,22 +1647,22 @@ static gboolean gtk_hex_key_press(GtkWidget *w, GdkEventKey *event) {
 			gh->active_view = VIEW_ASCII;
 		}
 		break;
-	case GDK_Delete:
+	case GDK_KEY_Delete:
 		if(gh->cursor_pos < gh->document->file_size) {
 			hex_document_set_data(gh->document, gh->cursor_pos,
 								  0, 1, NULL, TRUE);
 		}
 		break;
-	case GDK_Up:
+	case GDK_KEY_Up:
 		gtk_hex_set_cursor(gh, gh->cursor_pos - gh->cpl);
 		break;
-	case GDK_Down:
+	case GDK_KEY_Down:
 		gtk_hex_set_cursor(gh, gh->cursor_pos + gh->cpl);
 		break;
-	case GDK_Page_Up:
+	case GDK_KEY_Page_Up:
 		gtk_hex_set_cursor(gh, MAX(0, (gint)gh->cursor_pos - gh->vis_lines*gh->cpl));
 		break;
-	case GDK_Page_Down:
+	case GDK_KEY_Page_Down:
 		gtk_hex_set_cursor(gh, MIN((gint)gh->document->file_size, (gint)gh->cursor_pos + gh->vis_lines*gh->cpl));
 		break;
 	default:
@@ -1672,7 +1672,7 @@ static gboolean gtk_hex_key_press(GtkWidget *w, GdkEventKey *event) {
 		}
 		if(gh->active_view == VIEW_HEX)
 			switch(event->keyval) {
-			case GDK_Left:
+			case GDK_KEY_Left:
 				if(!(event->state & GDK_SHIFT_MASK)) {
 					gh->lower_nibble = !gh->lower_nibble;
 					if(gh->lower_nibble)
@@ -1682,7 +1682,7 @@ static gboolean gtk_hex_key_press(GtkWidget *w, GdkEventKey *event) {
 					gtk_hex_set_cursor(gh, gh->cursor_pos - 1);
 				}
 				break;
-			case GDK_Right:
+			case GDK_KEY_Right:
 				if(gh->cursor_pos >= gh->document->file_size)
 					break;
 				if(!(event->state & GDK_SHIFT_MASK)) {
@@ -1727,8 +1727,8 @@ static gboolean gtk_hex_key_press(GtkWidget *w, GdkEventKey *event) {
 					if(!gh->lower_nibble)
 						gtk_hex_set_cursor(gh, gh->cursor_pos + 1);
 				}
-				else if((event->keyval >= GDK_KP_0)&&(event->keyval <= GDK_KP_9)) {
-					hex_document_set_nibble(gh->document, event->keyval - GDK_KP_0,
+				else if((event->keyval >= GDK_KEY_KP_0)&&(event->keyval <= GDK_KEY_KP_9)) {
+					hex_document_set_nibble(gh->document, event->keyval - GDK_KEY_KP_0,
 											gh->cursor_pos, gh->lower_nibble,
 											gh->insert, TRUE);
 					if (gh->selecting)
@@ -1744,10 +1744,10 @@ static gboolean gtk_hex_key_press(GtkWidget *w, GdkEventKey *event) {
 			}
 		else if(gh->active_view == VIEW_ASCII)
 			switch(event->keyval) {
-			case GDK_Left:
+			case GDK_KEY_Left:
 				gtk_hex_set_cursor(gh, gh->cursor_pos - 1);
 				break;
-			case GDK_Right:
+			case GDK_KEY_Right:
 				gtk_hex_set_cursor(gh, gh->cursor_pos + 1);
 				break;
 			default:
@@ -1760,8 +1760,8 @@ static gboolean gtk_hex_key_press(GtkWidget *w, GdkEventKey *event) {
 						gh->selecting = FALSE;
 					gtk_hex_set_cursor(gh, gh->cursor_pos + 1);
 				}
-				else if((event->keyval >= GDK_KP_0)&&(event->keyval <= GDK_KP_9)) {
-					hex_document_set_byte(gh->document, event->keyval - GDK_KP_0 + '0',
+				else if((event->keyval >= GDK_KEY_KP_0)&&(event->keyval <= GDK_KEY_KP_9)) {
+					hex_document_set_byte(gh->document, event->keyval - GDK_KEY_KP_0 + '0',
 											gh->cursor_pos, gh->insert, TRUE);
 					if (gh->selecting)
 						gh->selecting = FALSE;
@@ -1783,7 +1783,7 @@ static gboolean gtk_hex_key_press(GtkWidget *w, GdkEventKey *event) {
 static gboolean gtk_hex_key_release(GtkWidget *w, GdkEventKey *event) {
 	GtkHex *gh = GTK_HEX(w);
 
-	if(event->keyval == GDK_Shift_L || event->keyval == GDK_Shift_R) {
+	if (event->keyval == GDK_KEY_Shift_L || event->keyval == GDK_KEY_Shift_R) {
 		gh->selecting = FALSE;
 	}