diff options
author | Monsta <[email protected]> | 2015-08-03 18:04:03 +0300 |
---|---|---|
committer | Monsta <[email protected]> | 2015-08-03 18:04:03 +0300 |
commit | 79c3e2849004a5c81a0b0bc25fb9dc0e1ce8a781 (patch) | |
tree | a65addd96617d0b92b05a8f6d7c4b0d44b88d0de /pluma/pluma-view.c | |
parent | 121e7b4f8a9a3b0571286929fbc504988561d148 (diff) | |
download | pluma-79c3e2849004a5c81a0b0bc25fb9dc0e1ce8a781.tar.bz2 pluma-79c3e2849004a5c81a0b0bc25fb9dc0e1ce8a781.tar.xz |
drop gdkkeysyms-compat usage, use modern key names
Diffstat (limited to 'pluma/pluma-view.c')
-rw-r--r-- | pluma/pluma-view.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/pluma/pluma-view.c b/pluma/pluma-view.c index d17b6a01..d68031d4 100644 --- a/pluma/pluma-view.c +++ b/pluma/pluma-view.c @@ -40,7 +40,6 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #if GTK_CHECK_VERSION (3, 0, 0) -#include <gdk/gdkkeysyms-compat.h> #include <gtksourceview/gtksourceview.h> #endif @@ -279,22 +278,22 @@ pluma_view_class_init (PlumaViewClass *klass) binding_set = gtk_binding_set_by_class (klass); gtk_binding_entry_add_signal (binding_set, - GDK_k, + GDK_KEY_k, GDK_CONTROL_MASK, "start_interactive_search", 0); gtk_binding_entry_add_signal (binding_set, - GDK_i, + GDK_KEY_i, GDK_CONTROL_MASK, "start_interactive_goto_line", 0); gtk_binding_entry_add_signal (binding_set, - GDK_k, + GDK_KEY_k, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "reset_searched_text", 0); gtk_binding_entry_add_signal (binding_set, - GDK_d, + GDK_KEY_d, GDK_CONTROL_MASK, "delete_from_cursor", 2, G_TYPE_ENUM, GTK_DELETE_PARAGRAPHS, @@ -1084,14 +1083,14 @@ search_window_key_press_event (GtkWidget *widget, modifiers = gtk_accelerator_get_default_mod_mask (); /* Close window */ - if (event->keyval == GDK_Tab) + if (event->keyval == GDK_KEY_Tab) { hide_search_window (view, FALSE); retval = TRUE; } /* Close window and cancel the search */ - if (event->keyval == GDK_Escape) + if (event->keyval == GDK_KEY_Escape) { if (view->priv->search_mode == SEARCH) { @@ -1115,28 +1114,28 @@ search_window_key_press_event (GtkWidget *widget, /* SEARCH mode */ /* select previous matching iter */ - if (event->keyval == GDK_Up || event->keyval == GDK_KP_Up) + if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up) { search_again (view, TRUE); retval = TRUE; } if (((event->state & modifiers) == (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) && - (event->keyval == GDK_g || event->keyval == GDK_G)) + (event->keyval == GDK_KEY_g || event->keyval == GDK_KEY_G)) { search_again (view, TRUE); retval = TRUE; } /* select next matching iter */ - if (event->keyval == GDK_Down || event->keyval == GDK_KP_Down) + if (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_KP_Down) { search_again (view, FALSE); retval = TRUE; } if (((event->state & modifiers) == GDK_CONTROL_MASK) && - (event->keyval == GDK_g || event->keyval == GDK_G)) + (event->keyval == GDK_KEY_g || event->keyval == GDK_KEY_G)) { search_again (view, FALSE); retval = TRUE; |