summaryrefslogtreecommitdiff
path: root/pluma
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-08-03 18:04:03 +0300
committerMonsta <[email protected]>2015-08-03 18:04:03 +0300
commit79c3e2849004a5c81a0b0bc25fb9dc0e1ce8a781 (patch)
treea65addd96617d0b92b05a8f6d7c4b0d44b88d0de /pluma
parent121e7b4f8a9a3b0571286929fbc504988561d148 (diff)
downloadpluma-79c3e2849004a5c81a0b0bc25fb9dc0e1ce8a781.tar.bz2
pluma-79c3e2849004a5c81a0b0bc25fb9dc0e1ce8a781.tar.xz
drop gdkkeysyms-compat usage, use modern key names
Diffstat (limited to 'pluma')
-rwxr-xr-xpluma/dialogs/pluma-search-dialog.c7
-rw-r--r--pluma/pluma-commands-search.c5
-rw-r--r--pluma/pluma-panel.c19
-rw-r--r--pluma/pluma-print-preview.c48
-rw-r--r--pluma/pluma-view.c21
5 files changed, 44 insertions, 56 deletions
diff --git a/pluma/dialogs/pluma-search-dialog.c b/pluma/dialogs/pluma-search-dialog.c
index 18097cb8..5c85dff8 100755
--- a/pluma/dialogs/pluma-search-dialog.c
+++ b/pluma/dialogs/pluma-search-dialog.c
@@ -36,9 +36,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 "pluma-search-dialog.h"
#include "pluma-history-entry.h"
@@ -182,8 +179,8 @@ pluma_search_dialog_class_init (PlumaSearchDialogClass *klass)
/* Note: we cannot use the keyval/modifier associated with the
* GTK_STOCK_FIND_AND_REPLACE stock item since MATE HIG suggests Ctrl+h
* for Replace while gtk+ uses Ctrl+r */
- gtk_binding_entry_add_signal (binding_set, GDK_h, GDK_CONTROL_MASK, "show_replace", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_H, GDK_CONTROL_MASK, "show_replace", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_h, GDK_CONTROL_MASK, "show_replace", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_H, GDK_CONTROL_MASK, "show_replace", 0);
}
static void
diff --git a/pluma/pluma-commands-search.c b/pluma/pluma-commands-search.c
index 01780f42..278524c7 100644
--- a/pluma/pluma-commands-search.c
+++ b/pluma/pluma-commands-search.c
@@ -39,7 +39,6 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gdk/gdkkeysyms-compat.h>
#define GTK_OBJECT G_OBJECT
#endif
@@ -765,7 +764,7 @@ _pluma_cmd_search_goto_line (GtkAction *action,
* the corrisponding binding.
*/
gtk_bindings_activate (GTK_OBJECT (active_view),
- GDK_i,
+ GDK_KEY_i,
GDK_CONTROL_MASK);
}
@@ -789,6 +788,6 @@ _pluma_cmd_search_incremental_search (GtkAction *action,
* the corrisponding binding.
*/
gtk_bindings_activate (GTK_OBJECT (active_view),
- GDK_k,
+ GDK_KEY_k,
GDK_CONTROL_MASK);
}
diff --git a/pluma/pluma-panel.c b/pluma/pluma-panel.c
index 8e2654a7..f75e45f9 100644
--- a/pluma/pluma-panel.c
+++ b/pluma/pluma-panel.c
@@ -34,9 +34,6 @@
#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gdk/gdkkeysyms-compat.h>
-#endif
#include "pluma-close-button.h"
#include "pluma-window.h"
@@ -244,15 +241,15 @@ pluma_panel_class_init (PlumaPanelClass *klass)
G_TYPE_NONE, 0);
binding_set = gtk_binding_set_by_class (klass);
- gtk_binding_entry_add_signal (binding_set,
- GDK_Escape,
- 0,
- "close",
+ gtk_binding_entry_add_signal (binding_set,
+ GDK_KEY_Escape,
+ 0,
+ "close",
0);
- gtk_binding_entry_add_signal (binding_set,
- GDK_Return,
- GDK_CONTROL_MASK,
- "focus_document",
+ gtk_binding_entry_add_signal (binding_set,
+ GDK_KEY_Return,
+ GDK_CONTROL_MASK,
+ "focus_document",
0);
}
diff --git a/pluma/pluma-print-preview.c b/pluma/pluma-print-preview.c
index ac7bbdd8..7effe8e2 100644
--- a/pluma/pluma-print-preview.c
+++ b/pluma/pluma-print-preview.c
@@ -36,10 +36,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 <cairo-pdf.h>
#include "pluma-print-preview.h"
@@ -819,49 +815,49 @@ preview_layout_key_press (GtkWidget *widget,
break;
case '+':
case '=':
- case GDK_KP_Add:
+ case GDK_KEY_KP_Add:
zoom_in (preview);
break;
case '-':
case '_':
- case GDK_KP_Subtract:
+ case GDK_KEY_KP_Subtract:
zoom_out (preview);
break;
- case GDK_KP_Right:
- case GDK_Right:
+ case GDK_KEY_KP_Right:
+ case GDK_KEY_Right:
if (event->state & GDK_SHIFT_MASK)
x = hupper - hpage;
else
x = MIN (hupper - hpage, x + hstep);
domove = TRUE;
break;
- case GDK_KP_Left:
- case GDK_Left:
+ case GDK_KEY_KP_Left:
+ case GDK_KEY_Left:
if (event->state & GDK_SHIFT_MASK)
x = hlower;
else
x = MAX (hlower, x - hstep);
domove = TRUE;
break;
- case GDK_KP_Up:
- case GDK_Up:
+ case GDK_KEY_KP_Up:
+ case GDK_KEY_Up:
if (event->state & GDK_SHIFT_MASK)
goto page_up;
y = MAX (vlower, y - vstep);
domove = TRUE;
break;
- case GDK_KP_Down:
- case GDK_Down:
+ case GDK_KEY_KP_Down:
+ case GDK_KEY_Down:
if (event->state & GDK_SHIFT_MASK)
goto page_down;
y = MIN (vupper - vpage, y + vstep);
domove = TRUE;
break;
- case GDK_KP_Page_Up:
- case GDK_Page_Up:
- case GDK_Delete:
- case GDK_KP_Delete:
- case GDK_BackSpace:
+ case GDK_KEY_KP_Page_Up:
+ case GDK_KEY_Page_Up:
+ case GDK_KEY_Delete:
+ case GDK_KEY_KP_Delete:
+ case GDK_KEY_BackSpace:
page_up:
if (y <= vlower)
{
@@ -877,8 +873,8 @@ preview_layout_key_press (GtkWidget *widget,
}
domove = TRUE;
break;
- case GDK_KP_Page_Down:
- case GDK_Page_Down:
+ case GDK_KEY_KP_Page_Down:
+ case GDK_KEY_Page_Down:
case ' ':
page_down:
if (y >= (vupper - vpage))
@@ -895,19 +891,19 @@ preview_layout_key_press (GtkWidget *widget,
}
domove = TRUE;
break;
- case GDK_KP_Home:
- case GDK_Home:
+ case GDK_KEY_KP_Home:
+ case GDK_KEY_Home:
goto_page (preview, 0);
y = 0;
domove = TRUE;
break;
- case GDK_KP_End:
- case GDK_End:
+ case GDK_KEY_KP_End:
+ case GDK_KEY_End:
goto_page (preview, preview->priv->n_pages - 1);
y = 0;
domove = TRUE;
break;
- case GDK_Escape:
+ case GDK_KEY_Escape:
gtk_widget_destroy (GTK_WIDGET (preview));
break;
case 'c':
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;
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-22 04:01:03 +0000