diff options
| author | infirit <[email protected]> | 2014-12-09 12:15:24 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-12-09 23:02:27 +0100 |
| commit | 40a47584d8c96b6fe31d1948048ee411cd8b9431 (patch) | |
| tree | d8cee9dd7566562e08267c405fcae329b908e3c4 /shell | |
| parent | d205c55d5e18977aa5fe2f522c38ec6746a6aaaf (diff) | |
| download | atril-40a47584d8c96b6fe31d1948048ee411cd8b9431.tar.bz2 atril-40a47584d8c96b6fe31d1948048ee411cd8b9431.tar.xz | |
GDK_KEY_* keys are Gtk+2 as well.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/eggfindbar.c | 17 | ||||
| -rw-r--r-- | shell/ev-sidebar.c | 11 |
2 files changed, 11 insertions, 17 deletions
diff --git a/shell/eggfindbar.c b/shell/eggfindbar.c index fff123c7..6744d371 100644 --- a/shell/eggfindbar.c +++ b/shell/eggfindbar.c @@ -23,9 +23,6 @@ #include <glib/gi18n.h> #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#if GTK_CHECK_VERSION (3, 0, 0) -#include <gdk/gdkkeysyms-compat.h> -#endif #include "eggfindbar.h" @@ -184,25 +181,25 @@ egg_find_bar_class_init (EggFindBarClass *klass) binding_set = gtk_binding_set_by_class (klass); - gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0, "close", 0); - gtk_binding_entry_add_signal (binding_set, GDK_Up, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, 0, "scroll", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_BACKWARD); - gtk_binding_entry_add_signal (binding_set, GDK_Down, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, 0, "scroll", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_FORWARD); - gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Up, 0, "scroll", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD); - gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Up, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Up, 0, "scroll", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD); - gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Down, 0, "scroll", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD); - gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Down, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Down, 0, "scroll", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD); } diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c index 4d8a1de0..49413010 100644 --- a/shell/ev-sidebar.c +++ b/shell/ev-sidebar.c @@ -28,9 +28,6 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#if GTK_CHECK_VERSION (3, 0, 0) -#include <gdk/gdkkeysyms-compat.h> -#endif #include "ev-sidebar.h" #include "ev-sidebar-page.h" @@ -281,10 +278,10 @@ ev_sidebar_select_button_key_press_cb (GtkWidget *widget, { EvSidebar *ev_sidebar = EV_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 (ev_sidebar->priv->menu), NULL, NULL, ev_sidebar_menu_position_under, widget, |