From 2ade75158b3d8368c6f5d88b1b4bd3f2a0999f00 Mon Sep 17 00:00:00 2001 From: Eric House Date: Wed, 3 Aug 2016 08:20:05 -0700 Subject: [PATCH] gtk: update constants --- xwords4/linux/gtkaskdict.c | 5 ++--- xwords4/linux/gtkboard.c | 14 +++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/xwords4/linux/gtkaskdict.c b/xwords4/linux/gtkaskdict.c index 289acc7d0..a80d6e7dd 100644 --- a/xwords4/linux/gtkaskdict.c +++ b/xwords4/linux/gtkaskdict.c @@ -97,9 +97,8 @@ gtkaskdict( GSList* dicts, gchar* buf, gint buflen ) GtkWidget* button = gtk_button_new_with_label( "Ok" ); g_signal_connect( GTK_OBJECT(button), "clicked", G_CALLBACK(on_clicked), NULL ); - gtk_box_pack_start( GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), button, - FALSE, TRUE, 0 ); - // gtk_widget_show( button ); + gtk_box_pack_start( GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), + button, FALSE, TRUE, 0 ); gtk_widget_show_all( dialog ); gtk_main(); diff --git a/xwords4/linux/gtkboard.c b/xwords4/linux/gtkboard.c index 8e4a2505e..3b0d630ad 100644 --- a/xwords4/linux/gtkboard.c +++ b/xwords4/linux/gtkboard.c @@ -205,31 +205,31 @@ evtToXPKey( GdkEventKey* event, XP_Bool* movesCursorP ) switch( keyval ) { #ifdef KEYBOARD_NAV - case GDK_Return: + case GDK_KEY_Return: xpkey = XP_RETURN_KEY; break; - case GDK_space: + case GDK_KEY_space: xpkey = XP_RAISEFOCUS_KEY; break; - case GDK_Left: + case GDK_KEY_Left: xpkey = XP_CURSOR_KEY_LEFT; movesCursor = XP_TRUE; break; - case GDK_Right: + case GDK_KEY_Right: xpkey = XP_CURSOR_KEY_RIGHT; movesCursor = XP_TRUE; break; - case GDK_Up: + case GDK_KEY_Up: xpkey = XP_CURSOR_KEY_UP; movesCursor = XP_TRUE; break; - case GDK_Down: + case GDK_KEY_Down: xpkey = XP_CURSOR_KEY_DOWN; movesCursor = XP_TRUE; break; #endif - case GDK_BackSpace: + case GDK_KEY_BackSpace: XP_LOGF( "... it's a DEL" ); xpkey = XP_CURSOR_KEY_DEL; break;