changed GDK_<key> to GDK_KEY_<key>

diff --git a/src/collect-table.c b/src/collect-table.c
index 69278eb..77b1971 100644 (file)
--- a/src/collect-table.c
+++ b/src/collect-table.c
@@ -1144,33 +1144,33 @@ static gboolean collection_table_press_key_cb(GtkWidget *widget, GdkEventKey *ev
 
        switch (event->keyval)
                {
-               case GDK_Left: case GDK_KP_Left:
+               case GDK_KEY_Left: case GDK_KEY_KP_Left:
                        focus_col = -1;
                        break;
-               case GDK_Right: case GDK_KP_Right:
+               case GDK_KEY_Right: case GDK_KEY_KP_Right:
                        focus_col = 1;
                        break;
-               case GDK_Up: case GDK_KP_Up:
+               case GDK_KEY_Up: case GDK_KEY_KP_Up:
                        focus_row = -1;
                        break;
-               case GDK_Down: case GDK_KP_Down:
+               case GDK_KEY_Down: case GDK_KEY_KP_Down:
                        focus_row = 1;
                        break;
-               case GDK_Page_Up: case GDK_KP_Page_Up:
+               case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
                        focus_row = -page_height(ct);
                        break;
-               case GDK_Page_Down: case GDK_KP_Page_Down:
+               case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
                        focus_row = page_height(ct);
                        break;
-               case GDK_Home: case GDK_KP_Home:
+               case GDK_KEY_Home: case GDK_KEY_KP_Home:
                        focus_row = -ct->focus_row;
                        focus_col = -ct->focus_column;
                        break;
-               case GDK_End: case GDK_KP_End:
+               case GDK_KEY_End: case GDK_KEY_KP_End:
                        focus_row = ct->rows - 1 - ct->focus_row;
                        focus_col = ct->columns - 1 - ct->focus_column;
                        break;
-               case GDK_space:
+               case GDK_KEY_space:
                        info = collection_table_find_data(ct, ct->focus_row, ct->focus_column, NULL);
                        if (info)
                                {
@@ -1189,8 +1189,8 @@ static gboolean collection_table_press_key_cb(GtkWidget *widget, GdkEventKey *ev
                case 'T': case 't':
                        if (event->state & GDK_CONTROL_MASK) collection_table_toggle_filenames(ct);
                        break;
-               case GDK_Menu:
-               case GDK_F10:
+               case GDK_KEY_Menu:
+               case GDK_KEY_F10:
                        info = collection_table_find_data(ct, ct->focus_row, ct->focus_column, NULL);
                        ct->click_info = info;
 

diff --git a/src/collect.c b/src/collect.c
index 3a1b356..bec55d2 100644 (file)
--- a/src/collect.c
+++ b/src/collect.c
@@ -901,7 +901,7 @@ static gboolean collection_window_keypress(GtkWidget *widget, GdkEventKey *event
                stop_signal = TRUE;
                switch (event->keyval)
                        {
-                       case GDK_Return: case GDK_KP_Enter:
+                       case GDK_KEY_Return: case GDK_KEY_KP_Enter:
                                layout_image_set_collection(NULL, cw->cd,
                                        collection_table_get_focus_info(cw->table));
                                break;
@@ -951,7 +951,7 @@ static gboolean collection_window_keypress(GtkWidget *widget, GdkEventKey *event
                                        collection_set_sort_method(cw->cd, SORT_PATH);
                                        }
                                break;
-                       case GDK_Delete: case GDK_KP_Delete:
+                       case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
                                list = g_list_copy(cw->table->selection);
                                if (list)
                                        {

diff --git a/src/dupe.c b/src/dupe.c
index de5192a..dc67bab 100644 (file)
--- a/src/dupe.c
+++ b/src/dupe.c
@@ -2971,7 +2971,7 @@ static gboolean dupe_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, g
                                                gtk_tree_selection_select_all(selection);
                                                }
                                        break;
-                               case GDK_Delete: case GDK_KP_Delete:
+                               case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
                                        if (on_second)
                                                {
                                                dupe_second_clear(dw);
@@ -3009,13 +3009,13 @@ static gboolean dupe_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, g
                stop_signal = TRUE;
                switch (event->keyval)
                        {
-                       case GDK_Return: case GDK_KP_Enter:
+                       case GDK_KEY_Return: case GDK_KEY_KP_Enter:
                                dupe_menu_view(dw, di, listview, FALSE);
                                break;
                        case 'V': case 'v':
                                dupe_menu_view(dw, di, listview, TRUE);
                                break;
-                       case GDK_Delete: case GDK_KP_Delete:
+                       case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
                                dupe_window_remove_selection(dw, listview);
                                break;
                        case 'C': case 'c':
@@ -3030,8 +3030,8 @@ static gboolean dupe_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, g
                        case '2':
                                dupe_listview_select_dupes(dw, FALSE);
                                break;
-                       case GDK_Menu:
-                       case GDK_F10:
+                       case GDK_KEY_Menu:
+                       case GDK_KEY_F10:
                                if (!on_second)
                                        {
                                        GtkWidget *menu;

diff --git a/src/img-view.c b/src/img-view.c
index fef7676..6a1d9df 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -340,16 +340,16 @@ static gboolean view_window_key_press_cb(GtkWidget *widget, GdkEventKey *event,
        stop_signal = TRUE;
        switch (event->keyval)
                {
-               case GDK_Left: case GDK_KP_Left:
+               case GDK_KEY_Left: case GDK_KEY_KP_Left:
                        x -= 1;
                        break;
-               case GDK_Right: case GDK_KP_Right:
+               case GDK_KEY_Right: case GDK_KEY_KP_Right:
                        x += 1;
                        break;
-               case GDK_Up: case GDK_KP_Up:
+               case GDK_KEY_Up: case GDK_KEY_KP_Up:
                        y -= 1;
                        break;
-               case GDK_Down: case GDK_KP_Down:
+               case GDK_KEY_Down: case GDK_KEY_KP_Down:
                        y += 1;
                        break;
                default:
@@ -467,32 +467,32 @@ static gboolean view_window_key_press_cb(GtkWidget *widget, GdkEventKey *event,
                stop_signal = TRUE;
                switch (event->keyval)
                        {
-                       case GDK_Page_Up: case GDK_KP_Page_Up:
-                       case GDK_BackSpace:
+                       case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
+                       case GDK_KEY_BackSpace:
                        case 'B': case 'b':
                                view_step_prev(vw);
                                break;
-                       case GDK_Page_Down: case GDK_KP_Page_Down:
-                       case GDK_space:
+                       case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
+                       case GDK_KEY_space:
                        case 'N': case 'n':
                                view_step_next(vw);
                                break;
-                       case GDK_Home: case GDK_KP_Home:
+                       case GDK_KEY_Home: case GDK_KEY_KP_Home:
                                view_step_to_end(vw, FALSE);
                                break;
-                       case GDK_End: case GDK_KP_End:
+                       case GDK_KEY_End: case GDK_KEY_KP_End:
                                view_step_to_end(vw, TRUE);
                                break;
-                       case '+': case '=': case GDK_KP_Add:
+                       case '+': case '=': case GDK_KEY_KP_Add:
                                image_zoom_adjust(imd, get_zoom_increment());
                                break;
-                       case '-': case GDK_KP_Subtract:
+                       case '-': case GDK_KEY_KP_Subtract:
                                image_zoom_adjust(imd, -get_zoom_increment());
                                break;
-                       case 'X': case 'x': case GDK_KP_Multiply:
+                       case 'X': case 'x': case GDK_KEY_KP_Multiply:
                                image_zoom_set(imd, 0.0);
                                break;
-                       case 'Z': case 'z': case GDK_KP_Divide: case '1':
+                       case 'Z': case 'z': case GDK_KEY_KP_Divide: case '1':
                                image_zoom_set(imd, 1.0);
                                break;
                        case '2':
@@ -537,7 +537,7 @@ static gboolean view_window_key_press_cb(GtkWidget *widget, GdkEventKey *event,
                                break;
                        case 'F': case 'f':
                        case 'V': case 'v':
-                       case GDK_F11:
+                       case GDK_KEY_F11:
                                view_fullscreen_toggle(vw, FALSE);
                                break;
                        case 'I': case 'i':
@@ -549,13 +549,13 @@ static gboolean view_window_key_press_cb(GtkWidget *widget, GdkEventKey *event,
                        case '[':
                                image_alter_orientation(imd, ALTER_ROTATE_90_CC);
                                break;
-                       case GDK_Delete: case GDK_KP_Delete:
+                       case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
                                if (options->file_ops.enable_delete_key)
                                        {
                                        file_util_delete(image_get_fd(imd), NULL, imd->widget);
                                        }
                                break;
-                       case GDK_Escape:
+                       case GDK_KEY_Escape:
                                if (vw->fs)
                                        {
                                        view_fullscreen_toggle(vw, TRUE);
@@ -565,8 +565,8 @@ static gboolean view_window_key_press_cb(GtkWidget *widget, GdkEventKey *event,
                                        view_window_close(vw);
                                        }
                                break;
-                       case GDK_Menu:
-                       case GDK_F10:
+                       case GDK_KEY_Menu:
+                       case GDK_KEY_F10:
                                menu = view_popup_menu(vw);
                                gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
                                               view_window_menu_pos_cb, vw, 0, GDK_CURRENT_TIME);

diff --git a/src/layout_util.c b/src/layout_util.c
index e667449..f88bdd2 100644 (file)
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -64,10 +64,10 @@ static void layout_util_sync_views(LayoutWindow *lw);
  */
 
 static guint tree_key_overrides[] = {
-       GDK_Page_Up,    GDK_KP_Page_Up,
-       GDK_Page_Down,  GDK_KP_Page_Down,
-       GDK_Home,       GDK_KP_Home,
-       GDK_End,        GDK_KP_End
+       GDK_KEY_Page_Up,        GDK_KEY_KP_Page_Up,
+       GDK_KEY_Page_Down,      GDK_KEY_KP_Page_Down,
+       GDK_KEY_Home,   GDK_KEY_KP_Home,
+       GDK_KEY_End,    GDK_KEY_KP_End
 };
 
 static gboolean layout_key_match(guint keyval)
@@ -95,7 +95,7 @@ gboolean layout_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
        if (lw->path_entry && GTK_WIDGET_HAS_FOCUS(lw->path_entry))
 #endif
                {
-               if (event->keyval == GDK_Escape && lw->dir_fd)
+               if (event->keyval == GDK_KEY_Escape && lw->dir_fd)
                        {
                        gtk_entry_set_text(GTK_ENTRY(lw->path_entry), lw->dir_fd->path);
                        }
@@ -140,16 +140,16 @@ gboolean layout_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
                stop_signal = TRUE;
                switch (event->keyval)
                        {
-                       case GDK_Left: case GDK_KP_Left:
+                       case GDK_KEY_Left: case GDK_KEY_KP_Left:
                                x -= 1;
                                break;
-                       case GDK_Right: case GDK_KP_Right:
+                       case GDK_KEY_Right: case GDK_KEY_KP_Right:
                                x += 1;
                                break;
-                       case GDK_Up: case GDK_KP_Up:
+                       case GDK_KEY_Up: case GDK_KEY_KP_Up:
                                y -= 1;
                                break;
-                       case GDK_Down: case GDK_KP_Down:
+                       case GDK_KEY_Down: case GDK_KEY_KP_Down:
                                y += 1;
                                break;
                        default:
@@ -163,7 +163,7 @@ gboolean layout_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
                        stop_signal = TRUE;
                        switch (event->keyval)
                                {
-                               case GDK_Menu:
+                               case GDK_KEY_Menu:
                                        layout_image_menu_popup(lw);
                                        break;
                                default:

diff --git a/src/logwindow.c b/src/logwindow.c
index b94725b..8f27080 100644 (file)
--- a/src/logwindow.c
+++ b/src/logwindow.c
@@ -57,7 +57,7 @@ static void hide_cb(GtkWidget *widget, LogWindow *logwin)
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                            LogWindow *logwin)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                gtk_widget_hide(logwin->window);
        return FALSE;
 }

diff --git a/src/pan-view.c b/src/pan-view.c
index 6e7edff..82e118c 100644 (file)
--- a/src/pan-view.c
+++ b/src/pan-view.c
@@ -1227,28 +1227,28 @@ static gboolean pan_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, g
                stop_signal = TRUE;
                switch (event->keyval)
                        {
-                       case GDK_Left: case GDK_KP_Left:
+                       case GDK_KEY_Left: case GDK_KEY_KP_Left:
                                x -= 1;
                                break;
-                       case GDK_Right: case GDK_KP_Right:
+                       case GDK_KEY_Right: case GDK_KEY_KP_Right:
                                x += 1;
                                break;
-                       case GDK_Up: case GDK_KP_Up:
+                       case GDK_KEY_Up: case GDK_KEY_KP_Up:
                                y -= 1;
                                break;
-                       case GDK_Down: case GDK_KP_Down:
+                       case GDK_KEY_Down: case GDK_KEY_KP_Down:
                                y += 1;
                                break;
-                       case GDK_Page_Up: case GDK_KP_Page_Up:
+                       case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
                                pixbuf_renderer_scroll(pr, 0, 0 - pr->vis_height / 2);
                                break;
-                       case GDK_Page_Down: case GDK_KP_Page_Down:
+                       case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
                                pixbuf_renderer_scroll(pr, 0, pr->vis_height / 2);
                                break;
-                       case GDK_Home: case GDK_KP_Home:
+                       case GDK_KEY_Home: case GDK_KEY_KP_Home:
                                pixbuf_renderer_scroll(pr, 0 - pr->vis_width / 2, 0);
                                break;
-                       case GDK_End: case GDK_KP_End:
+                       case GDK_KEY_End: case GDK_KEY_KP_End:
                                pixbuf_renderer_scroll(pr, pr->vis_width / 2, 0);
                                break;
                        default:
@@ -1348,7 +1348,7 @@ static gboolean pan_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, g
                stop_signal = TRUE;
                switch (event->keyval)
                        {
-                       case GDK_Escape:
+                       case GDK_KEY_Escape:
                                if (pw->fs)
                                        {
                                        pan_fullscreen_toggle(pw, TRUE);
@@ -1370,13 +1370,13 @@ static gboolean pan_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, g
                        stop_signal = TRUE;
                        switch (event->keyval)
                                {
-                               case '+': case '=': case GDK_KP_Add:
+                               case '+': case '=': case GDK_KEY_KP_Add:
                                        pixbuf_renderer_zoom_adjust(pr, ZOOM_INCREMENT);
                                        break;
-                               case '-': case GDK_KP_Subtract:
+                               case '-': case GDK_KEY_KP_Subtract:
                                        pixbuf_renderer_zoom_adjust(pr, -ZOOM_INCREMENT);
                                        break;
-                               case 'Z': case 'z': case GDK_KP_Divide: case '1':
+                               case 'Z': case 'z': case GDK_KEY_KP_Divide: case '1':
                                        pixbuf_renderer_zoom_set(pr, 1.0);
                                        break;
                                case '2':
@@ -1399,7 +1399,7 @@ static gboolean pan_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, g
                                        break;
                                case 'F': case 'f':
                                case 'V': case 'v':
-                               case GDK_F11:
+                               case GDK_KEY_F11:
                                        pan_fullscreen_toggle(pw, FALSE);
                                        break;
                                case 'I': case 'i':
@@ -1407,10 +1407,10 @@ static gboolean pan_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, g
                                        pan_overlay_toggle(pw);
 #endif
                                        break;
-                               case GDK_Delete: case GDK_KP_Delete:
+                               case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
                                        break;
-                               case GDK_Menu:
-                               case GDK_F10:
+                               case GDK_KEY_Menu:
+                               case GDK_KEY_F10:
                                        menu = pan_popup_menu(pw);
                                        gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
                                                       pan_window_menu_pos_cb, pw, 0, GDK_CURRENT_TIME);

diff --git a/src/search.c b/src/search.c
index e019148..8842d82 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -1276,7 +1276,7 @@ static gboolean search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event,
                                        gtk_tree_selection_select_all(selection);
                                        }
                                break;
-                       case GDK_Delete: case GDK_KP_Delete:
+                       case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
                                search_result_clear(sd);
                                break;
                        default:
@@ -1295,7 +1295,7 @@ static gboolean search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event,
                stop_signal = TRUE;
                switch (event->keyval)
                        {
-                       case GDK_Return: case GDK_KP_Enter:
+                       case GDK_KEY_Return: case GDK_KEY_KP_Enter:
                                if (mfd) layout_set_fd(NULL, mfd->fd);
                                break;
                        case 'V': case 'v':
@@ -1307,14 +1307,14 @@ static gboolean search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event,
                                filelist_free(list);
                                }
                                break;
-                       case GDK_Delete: case GDK_KP_Delete:
+                       case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
                                search_result_remove_selection(sd);
                                break;
                        case 'C': case 'c':
                                search_result_collection_from_selection(sd);
                                break;
-                       case GDK_Menu:
-                       case GDK_F10:
+                       case GDK_KEY_Menu:
+                       case GDK_KEY_F10:
                                {
                                GtkWidget *menu;
 

diff --git a/src/ui_bookmark.c b/src/ui_bookmark.c
index 6825960..e807cfa 100644 (file)
--- a/src/ui_bookmark.c
+++ b/src/ui_bookmark.c
@@ -439,20 +439,20 @@ static gboolean bookmark_keypress_cb(GtkWidget *button, GdkEventKey *event, gpoi
 
        switch (event->keyval)
                {
-               case GDK_F10:
+               case GDK_KEY_F10:
                        if (!(event->state & GDK_CONTROL_MASK)) return FALSE;
-               case GDK_Menu:
+               case GDK_KEY_Menu:
                        bookmark_menu_popup(bm, button, 0, event->time, TRUE);
                        return TRUE;
                        break;
-               case GDK_Up:
+               case GDK_KEY_Up:
                        if (event->state & GDK_SHIFT_MASK)
                                {
                                bookmark_move(bm, button, -1);
                                return TRUE;
                                }
                        break;
-               case GDK_Down:
+               case GDK_KEY_Down:
                        if (event->state & GDK_SHIFT_MASK)
                                {
                                bookmark_move(bm, button, 1);

diff --git a/src/ui_misc.c b/src/ui_misc.c
index 22f5fd3..9b28597 100644 (file)
--- a/src/ui_misc.c
+++ b/src/ui_misc.c
@@ -967,14 +967,14 @@ static gboolean date_selection_popup_keypress_cb(GtkWidget *widget, GdkEventKey
 
        switch (event->keyval)
                {
-               case GDK_Return:
-               case GDK_KP_Enter:
-               case GDK_Tab:
-               case GDK_ISO_Left_Tab:
+               case GDK_KEY_Return:
+               case GDK_KEY_KP_Enter:
+               case GDK_KEY_Tab:
+               case GDK_KEY_ISO_Left_Tab:
                        date_selection_popup_sync(ds);
                        date_selection_popup_hide(ds);
                        break;
-               case GDK_Escape:
+               case GDK_KEY_Escape:
                        date_selection_popup_hide(ds);
                        break;
                default:

diff --git a/src/ui_pathsel.c b/src/ui_pathsel.c
index fd8d2f3..7593a21 100644 (file)
--- a/src/ui_pathsel.c
+++ b/src/ui_pathsel.c
@@ -695,9 +695,9 @@ static gboolean dest_keypress_cb(GtkWidget *view, GdkEventKey *event, gpointer d
 
        switch (event->keyval)
                {
-               case GDK_F10:
+               case GDK_KEY_F10:
                        if (!(event->state & GDK_CONTROL_MASK)) return FALSE;
-               case GDK_Menu:
+               case GDK_KEY_Menu:
                        dest_view_store_selection(dd, GTK_TREE_VIEW(view));
                        dest_popup_menu(dd, GTK_TREE_VIEW(view), 0, event->time, TRUE);
                        return TRUE;
@@ -710,7 +710,7 @@ static gboolean dest_keypress_cb(GtkWidget *view, GdkEventKey *event, gpointer d
                                return TRUE;
                                }
                        break;
-               case GDK_Delete:
+               case GDK_KEY_Delete:
                        dest_view_store_selection(dd, GTK_TREE_VIEW(view));
                        dest_view_delete(dd, GTK_TREE_VIEW(view));
                        return TRUE;

diff --git a/src/ui_tabcomp.c b/src/ui_tabcomp.c
index 5764e07..6d4b060 100644 (file)
--- a/src/ui_tabcomp.c
+++ b/src/ui_tabcomp.c
@@ -236,8 +236,8 @@ static gboolean tab_completion_popup_key_press(GtkWidget *widget, GdkEventKey *e
 {
        TabCompData *td = data;
 
-       if (event->keyval == GDK_Tab ||
-           event->keyval == GDK_BackSpace ||
+       if (event->keyval == GDK_KEY_Tab ||
+           event->keyval == GDK_KEY_BackSpace ||
            (event->keyval >= 0x20 && event->keyval <= 0xFF) )
                {
                if (event->keyval >= 0x20 && event->keyval <= 0xFF)
@@ -615,7 +615,7 @@ static gboolean tab_completion_key_pressed(GtkWidget *widget, GdkEventKey *event
 
        switch (event->keyval)
                {
-               case GDK_Tab:
+               case GDK_KEY_Tab:
                        if (!(event->state & GDK_CONTROL_MASK))
                                {
                                if (tab_completion_do(td))
@@ -625,7 +625,7 @@ static gboolean tab_completion_key_pressed(GtkWidget *widget, GdkEventKey *event
                                stop_signal = TRUE;
                                }
                        break;
-               case GDK_Return: case GDK_KP_Enter:
+               case GDK_KEY_Return: case GDK_KEY_KP_Enter:
                        if (td->fd_button &&
                            (event->state & GDK_CONTROL_MASK))
                                {

diff --git a/src/ui_tree_edit.c b/src/ui_tree_edit.c
index 0b8ae76..a6a4798 100644 (file)
--- a/src/ui_tree_edit.c
+++ b/src/ui_tree_edit.c
@@ -104,21 +104,21 @@ static gboolean tree_edit_key_press_cb(GtkWidget *widget, GdkEventKey *event, gp
 
        switch (event->keyval)
                {
-               case GDK_Return:
-               case GDK_KP_Enter:
-               case GDK_Tab:           /* ok, we are going to intercept the focus change
+               case GDK_KEY_Return:
+               case GDK_KEY_KP_Enter:
+               case GDK_KEY_Tab:               /* ok, we are going to intercept the focus change
                                           from keyboard and act like return was hit */
-               case GDK_ISO_Left_Tab:
-               case GDK_Up:
-               case GDK_Down:
-               case GDK_KP_Up:
-               case GDK_KP_Down:
-               case GDK_KP_Left:
-               case GDK_KP_Right:
+               case GDK_KEY_ISO_Left_Tab:
+               case GDK_KEY_Up:
+               case GDK_KEY_Down:
+               case GDK_KEY_KP_Up:
+               case GDK_KEY_KP_Down:
+               case GDK_KEY_KP_Left:
+               case GDK_KEY_KP_Right:
                        tree_edit_do(ted);
                        tree_edit_close(ted);
                        break;
-               case GDK_Escape:
+               case GDK_KEY_Escape:
                        tree_edit_close(ted);
                        break;
                default:

diff --git a/src/ui_utildlg.c b/src/ui_utildlg.c
index 285bae3..ddc2c89 100644 (file)
--- a/src/ui_utildlg.c
+++ b/src/ui_utildlg.c
@@ -63,9 +63,9 @@ static gboolean generic_dialog_default_key_press_cb(GtkWidget *widget, GdkEventK
        GenericDialog *gd = data;
 
 #if GTK_CHECK_VERSION(2,20,0)
-       if (event->keyval == GDK_Return && gtk_widget_has_focus(widget)
+       if (event->keyval == GDK_KEY_Return && gtk_widget_has_focus(widget)
 #else
-       if (event->keyval == GDK_Return && GTK_WIDGET_HAS_FOCUS(widget)
+       if (event->keyval == GDK_KEY_Return && GTK_WIDGET_HAS_FOCUS(widget)
 #endif
            && gd->default_cb)
                {
@@ -91,7 +91,7 @@ static gboolean generic_dialog_key_press_cb(GtkWidget *widget, GdkEventKey *even
 {
        GenericDialog *gd = data;
 
-       if (event->keyval == GDK_Escape)
+       if (event->keyval == GDK_KEY_Escape)
                {
                if (gd->cancel_cb) gd->cancel_cb(gd, gd->data);
                if (gd->auto_close) generic_dialog_click_cb(widget, data);

diff --git a/src/view_dir_list.c b/src/view_dir_list.c
index be31380..ad51655 100644 (file)
--- a/src/view_dir_list.c
+++ b/src/view_dir_list.c
@@ -361,7 +361,7 @@ gboolean vdlist_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
        ViewDir *vd = data;
        GtkTreePath *tpath;
 
-       if (event->keyval != GDK_Menu) return FALSE;
+       if (event->keyval != GDK_KEY_Menu) return FALSE;
 
        gtk_tree_view_get_cursor(GTK_TREE_VIEW(vd->view), &tpath, NULL);
        if (tpath)

diff --git a/src/view_dir_tree.c b/src/view_dir_tree.c
index 7409bc8..1d39fd0 100644 (file)
--- a/src/view_dir_tree.c
+++ b/src/view_dir_tree.c
@@ -780,7 +780,7 @@ gboolean vdtree_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
 
        switch (event->keyval)
                {
-               case GDK_Menu:
+               case GDK_KEY_Menu:
                        vd->click_fd = fd;
                        vd_color_set(vd, vd->click_fd, TRUE);
 
@@ -789,9 +789,9 @@ gboolean vdtree_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
 
                        return TRUE;
                        break;
-               case GDK_plus:
-               case GDK_Right:
-               case GDK_KP_Add:
+               case GDK_KEY_plus:
+               case GDK_KEY_Right:
+               case GDK_KEY_KP_Add:
                        if (fd)
                                {
                                vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->dir_fd);

diff --git a/src/view_file_icon.c b/src/view_file_icon.c
index 1dd6787..0fc2307 100644 (file)
--- a/src/view_file_icon.c
+++ b/src/view_file_icon.c
@@ -1300,33 +1300,33 @@ gboolean vficon_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
        stop_signal = TRUE;
        switch (event->keyval)
                {
-               case GDK_Left: case GDK_KP_Left:
+               case GDK_KEY_Left: case GDK_KEY_KP_Left:
                        focus_col = -1;
                        break;
-               case GDK_Right: case GDK_KP_Right:
+               case GDK_KEY_Right: case GDK_KEY_KP_Right:
                        focus_col = 1;
                        break;
-               case GDK_Up: case GDK_KP_Up:
+               case GDK_KEY_Up: case GDK_KEY_KP_Up:
                        focus_row = -1;
                        break;
-               case GDK_Down: case GDK_KP_Down:
+               case GDK_KEY_Down: case GDK_KEY_KP_Down:
                        focus_row = 1;
                        break;
-               case GDK_Page_Up: case GDK_KP_Page_Up:
+               case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
                        focus_row = -page_height(vf);
                        break;
-               case GDK_Page_Down: case GDK_KP_Page_Down:
+               case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
                        focus_row = page_height(vf);
                        break;
-               case GDK_Home: case GDK_KP_Home:
+               case GDK_KEY_Home: case GDK_KEY_KP_Home:
                        focus_row = -VFICON(vf)->focus_row;
                        focus_col = -VFICON(vf)->focus_column;
                        break;
-               case GDK_End: case GDK_KP_End:
+               case GDK_KEY_End: case GDK_KEY_KP_End:
                        focus_row = VFICON(vf)->rows - 1 - VFICON(vf)->focus_row;
                        focus_col = VFICON(vf)->columns - 1 - VFICON(vf)->focus_column;
                        break;
-               case GDK_space:
+               case GDK_KEY_space:
                        id = vficon_find_data(vf, VFICON(vf)->focus_row, VFICON(vf)->focus_column, NULL);
                        if (id)
                                {
@@ -1354,7 +1354,7 @@ gboolean vficon_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
                                        }
                                }
                        break;
-               case GDK_Menu:
+               case GDK_KEY_Menu:
                        id = vficon_find_data(vf, VFICON(vf)->focus_row, VFICON(vf)->focus_column, NULL);
                        VFICON(vf)->click_id = id;
 

diff --git a/src/view_file_list.c b/src/view_file_list.c
index de69b4d..8fa36c4 100644 (file)
--- a/src/view_file_list.c
+++ b/src/view_file_list.c
@@ -548,7 +548,7 @@ gboolean vflist_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
        ViewFile *vf = data;
        GtkTreePath *tpath;
 
-       if (event->keyval != GDK_Menu) return FALSE;
+       if (event->keyval != GDK_KEY_Menu) return FALSE;
 
        gtk_tree_view_get_cursor(GTK_TREE_VIEW(vf->listview), &tpath, NULL);
        if (tpath)