diff options
| author | infirit <[email protected]> | 2014-06-05 17:59:40 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-06-05 18:25:51 +0200 |
| commit | 8f495b981fa6b14eb4448ad723100a73ebce4dc0 (patch) | |
| tree | df8a8ad007c380d9f7d40274e9e0c17157158bc5 | |
| parent | 99308586f09d0924c5b47987c9aa9bf4654550c5 (diff) | |
| download | mate-desktop-8f495b981fa6b14eb4448ad723100a73ebce4dc0.tar.bz2 mate-desktop-8f495b981fa6b14eb4448ad723100a73ebce4dc0.tar.xz | |
GDK_KEY_* was introduced in Gtk+ 2.22
| -rw-r--r-- | libmate-desktop/mate-aboutdialog.c | 9 | ||||
| -rw-r--r-- | libmate-desktop/mate-colorsel.c | 43 |
2 files changed, 22 insertions, 30 deletions
diff --git a/libmate-desktop/mate-aboutdialog.c b/libmate-desktop/mate-aboutdialog.c index b786b6b..e271bcf 100644 --- a/libmate-desktop/mate-aboutdialog.c +++ b/libmate-desktop/mate-aboutdialog.c @@ -33,9 +33,6 @@ #include <string.h> #include <gdk/gdkkeysyms.h> -#if GTK_CHECK_VERSION (3, 0, 0) -#include <gdk/gdkkeysyms-compat.h> -#endif #include <gtk/gtk.h> #include <glib/gi18n-lib.h> @@ -1764,9 +1761,9 @@ text_view_key_press_event (GtkWidget *text_view, switch (event->keyval) { - case GDK_Return: - case GDK_ISO_Enter: - case GDK_KP_Enter: + case GDK_KEY_Return: + case GDK_KEY_ISO_Enter: + case GDK_KEY_KP_Enter: buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)); gtk_text_buffer_get_iter_at_mark (buffer, &iter, gtk_text_buffer_get_insert (buffer)); diff --git a/libmate-desktop/mate-colorsel.c b/libmate-desktop/mate-colorsel.c index 8f01a61..d472444 100644 --- a/libmate-desktop/mate-colorsel.c +++ b/libmate-desktop/mate-colorsel.c @@ -32,11 +32,6 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#if GTK_CHECK_VERSION (3, 0, 0) -#include <gdk/gdkkeysyms-compat.h> -#else -#include <gdkconfig.h> -#endif #include <glib/gi18n-lib.h> #include "mate-colorsel.h" @@ -1664,11 +1659,11 @@ palette_activate (GtkWidget *widget, gpointer data) { /* should have a drawing area subclass with an activate signal */ - if ((event->keyval == GDK_space) || - (event->keyval == GDK_Return) || - (event->keyval == GDK_ISO_Enter) || - (event->keyval == GDK_KP_Enter) || - (event->keyval == GDK_KP_Space)) + if ((event->keyval == GDK_KEY_space) || + (event->keyval == GDK_KEY_Return) || + (event->keyval == GDK_KEY_ISO_Enter) || + (event->keyval == GDK_KEY_KP_Enter) || + (event->keyval == GDK_KEY_KP_Space)) { if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "color_set")) != 0) { @@ -1974,15 +1969,15 @@ key_press (GtkWidget *invisible, switch (event->keyval) { - case GDK_space: - case GDK_Return: - case GDK_ISO_Enter: - case GDK_KP_Enter: - case GDK_KP_Space: + case GDK_KEY_space: + case GDK_KEY_Return: + case GDK_KEY_ISO_Enter: + case GDK_KEY_KP_Enter: + case GDK_KEY_KP_Space: grab_color_at_mouse (screen, x, y, data); /* fall through */ - case GDK_Escape: + case GDK_KEY_Escape: shutdown_eyedropper (data); g_signal_handlers_disconnect_by_func (invisible, @@ -1995,23 +1990,23 @@ key_press (GtkWidget *invisible, return TRUE; #if defined GDK_WINDOWING_X11 || defined GDK_WINDOWING_WIN32 - case GDK_Up: - case GDK_KP_Up: + case GDK_KEY_Up: + case GDK_KEY_KP_Up: dy = state == GDK_MOD1_MASK ? -BIG_STEP : -1; break; - case GDK_Down: - case GDK_KP_Down: + case GDK_KEY_Down: + case GDK_KEY_KP_Down: dy = state == GDK_MOD1_MASK ? BIG_STEP : 1; break; - case GDK_Left: - case GDK_KP_Left: + case GDK_KEY_Left: + case GDK_KEY_KP_Left: dx = state == GDK_MOD1_MASK ? -BIG_STEP : -1; break; - case GDK_Right: - case GDK_KP_Right: + case GDK_KEY_Right: + case GDK_KEY_KP_Right: dx = state == GDK_MOD1_MASK ? BIG_STEP : 1; break; #endif |