diff options
| author | Elias Aebi <[email protected]> | 2013-04-25 18:10:59 +0200 |
|---|---|---|
| committer | Elias Aebi <[email protected]> | 2013-04-25 18:10:59 +0200 |
| commit | 38eb3c1377d100e03768bea9e356ded9231d560b (patch) | |
| tree | 05bfe4d43c123064407694cf9f699dc9cff75fe5 | |
| parent | a6b92010adfac205341cf0579b5b102a520f798e (diff) | |
| download | eom-38eb3c1377d100e03768bea9e356ded9231d560b.tar.bz2 eom-38eb3c1377d100e03768bea9e356ded9231d560b.tar.xz | |
replace GDK_<keyname> with GDK_KEY_<keyname>
| -rw-r--r-- | src/eom-sidebar.c | 8 | ||||
| -rw-r--r-- | src/eom-window.c | 30 |
2 files changed, 19 insertions, 19 deletions
diff --git a/src/eom-sidebar.c b/src/eom-sidebar.c index b61b07b..8d8b8b0 100644 --- a/src/eom-sidebar.c +++ b/src/eom-sidebar.c @@ -288,10 +288,10 @@ eom_sidebar_select_button_key_press_cb (GtkWidget *widget, { EomSidebar *eom_sidebar = EOM_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 (eom_sidebar->priv->menu), diff --git a/src/eom-window.c b/src/eom-window.c index d4b3482..1c3e3f8 100644 --- a/src/eom-window.c +++ b/src/eom-window.c @@ -4849,12 +4849,12 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event) gboolean handle_selection = FALSE; switch (event->keyval) { - case GDK_space: + case GDK_KEY_space: if (event->state & GDK_CONTROL_MASK) { handle_selection = TRUE; break; } - case GDK_Return: + case GDK_KEY_Return: if (gtk_container_get_focus_child (tbcontainer) == NULL) { /* Image properties dialog case */ if (event->state & GDK_MOD1_MASK) { @@ -4870,8 +4870,8 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event) result = TRUE; } break; - case GDK_p: - case GDK_P: + case GDK_KEY_p: + case GDK_KEY_P: if (EOM_WINDOW (widget)->priv->mode == EOM_WINDOW_MODE_FULLSCREEN || EOM_WINDOW (widget)->priv->mode == EOM_WINDOW_MODE_SLIDESHOW) { gboolean slideshow; @@ -4879,9 +4879,9 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event) eom_window_run_fullscreen (EOM_WINDOW (widget), !slideshow); } break; - case GDK_Q: - case GDK_q: - case GDK_Escape: + case GDK_KEY_Q: + case GDK_KEY_q: + case GDK_KEY_Escape: if (EOM_WINDOW (widget)->priv->mode == EOM_WINDOW_MODE_FULLSCREEN) { eom_window_stop_fullscreen (EOM_WINDOW (widget), FALSE); } else if (EOM_WINDOW (widget)->priv->mode == EOM_WINDOW_MODE_SLIDESHOW) { @@ -4891,7 +4891,7 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event) return TRUE; } break; - case GDK_Left: + case GDK_KEY_Left: if (event->state & GDK_MOD1_MASK) { /* Alt+Left moves to previous image */ if (is_rtl) { /* move to next in RTL mode */ @@ -4902,7 +4902,7 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event) result = TRUE; break; } /* else fall-trough is intended */ - case GDK_Up: + case GDK_KEY_Up: if (eom_scroll_view_scrollbars_visible (EOM_SCROLL_VIEW (EOM_WINDOW (widget)->priv->view))) { /* break to let scrollview handle the key */ break; @@ -4910,7 +4910,7 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event) if (gtk_container_get_focus_child (tbcontainer) != NULL) break; if (!gtk_widget_get_visible (EOM_WINDOW (widget)->priv->nav)) { - if (is_rtl && event->keyval == GDK_Left) { + if (is_rtl && event->keyval == GDK_KEY_Left) { /* handle RTL fall-through, * need to behave like GDK_Down then */ eom_window_cmd_go_next (NULL, @@ -4922,7 +4922,7 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event) result = TRUE; break; } - case GDK_Right: + case GDK_KEY_Right: if (event->state & GDK_MOD1_MASK) { /* Alt+Right moves to next image */ if (is_rtl) { /* move to previous in RTL mode */ @@ -4933,7 +4933,7 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event) result = TRUE; break; } /* else fall-trough is intended */ - case GDK_Down: + case GDK_KEY_Down: if (eom_scroll_view_scrollbars_visible (EOM_SCROLL_VIEW (EOM_WINDOW (widget)->priv->view))) { /* break to let scrollview handle the key */ break; @@ -4941,7 +4941,7 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event) if (gtk_container_get_focus_child (tbcontainer) != NULL) break; if (!gtk_widget_get_visible (EOM_WINDOW (widget)->priv->nav)) { - if (is_rtl && event->keyval == GDK_Right) { + if (is_rtl && event->keyval == GDK_KEY_Right) { /* handle RTL fall-through, * need to behave like GDK_Up then */ eom_window_cmd_go_prev (NULL, @@ -4953,7 +4953,7 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event) result = TRUE; break; } - case GDK_Page_Up: + case GDK_KEY_Page_Up: if (!eom_scroll_view_scrollbars_visible (EOM_SCROLL_VIEW (EOM_WINDOW (widget)->priv->view))) { if (!gtk_widget_get_visible (EOM_WINDOW (widget)->priv->nav)) { /* If the iconview is not visible skip to the @@ -4966,7 +4966,7 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event) handle_selection = TRUE; } break; - case GDK_Page_Down: + case GDK_KEY_Page_Down: if (!eom_scroll_view_scrollbars_visible (EOM_SCROLL_VIEW (EOM_WINDOW (widget)->priv->view))) { if (!gtk_widget_get_visible (EOM_WINDOW (widget)->priv->nav)) { /* If the iconview is not visible skip to the |