diff options
| author | infirit <[email protected]> | 2015-07-14 10:09:55 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-07-14 13:07:33 +0200 |
| commit | 8b65935648a94ba427e1fa457336485662cddd42 (patch) | |
| tree | 34f60155df3209e6b4446f70198c9c6068ebfe8c /mate-panel/drawer.c | |
| parent | 8c14769db1b13cffe7cafcdea482061bbe4d5dd4 (diff) | |
| download | mate-panel-8b65935648a94ba427e1fa457336485662cddd42.tar.bz2 mate-panel-8b65935648a94ba427e1fa457336485662cddd42.tar.xz | |
Drop gdkkeysyms-compat usage in Gtk+3
The new GDK_KEY_ keys are also in Gtk+2.
Diffstat (limited to 'mate-panel/drawer.c')
| -rw-r--r-- | mate-panel/drawer.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/mate-panel/drawer.c b/mate-panel/drawer.c index 2b8f4815..3d9ee804 100644 --- a/mate-panel/drawer.c +++ b/mate-panel/drawer.c @@ -18,9 +18,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 <gio/gio.h> #include "drawer.h" @@ -93,8 +90,8 @@ key_press_drawer (GtkWidget *widget, orient = PANEL_WIDGET (gtk_widget_get_parent (drawer->button))->orient; switch (event->keyval) { - case GDK_Up: - case GDK_KP_Up: + case GDK_KEY_Up: + case GDK_KEY_KP_Up: if (orient == GTK_ORIENTATION_HORIZONTAL) { if (!panel_toplevel_get_is_hidden (drawer->toplevel)) drawer_focus_panel_widget (drawer, GTK_DIR_TAB_BACKWARD); @@ -103,8 +100,8 @@ key_press_drawer (GtkWidget *widget, retval = FALSE; } break; - case GDK_Left: - case GDK_KP_Left: + case GDK_KEY_Left: + case GDK_KEY_KP_Left: if (orient == GTK_ORIENTATION_VERTICAL) { if (!panel_toplevel_get_is_hidden (drawer->toplevel)) drawer_focus_panel_widget (drawer, GTK_DIR_TAB_BACKWARD); @@ -113,8 +110,8 @@ key_press_drawer (GtkWidget *widget, retval = FALSE; } break; - case GDK_Down: - case GDK_KP_Down: + case GDK_KEY_Down: + case GDK_KEY_KP_Down: if (orient == GTK_ORIENTATION_HORIZONTAL) { if (!panel_toplevel_get_is_hidden (drawer->toplevel)) drawer_focus_panel_widget (drawer, GTK_DIR_TAB_FORWARD); @@ -123,8 +120,8 @@ key_press_drawer (GtkWidget *widget, retval = FALSE; } break; - case GDK_Right: - case GDK_KP_Right: + case GDK_KEY_Right: + case GDK_KEY_KP_Right: if (orient == GTK_ORIENTATION_VERTICAL) { if (!panel_toplevel_get_is_hidden (drawer->toplevel)) drawer_focus_panel_widget (drawer, GTK_DIR_TAB_FORWARD); @@ -133,7 +130,7 @@ key_press_drawer (GtkWidget *widget, retval = FALSE; } break; - case GDK_Escape: + case GDK_KEY_Escape: panel_toplevel_hide (drawer->toplevel, FALSE, -1); break; default: @@ -156,7 +153,7 @@ key_press_drawer_widget (GtkWidget *widget, { PanelWidget *panel_widget; - if (event->keyval != GDK_Escape) + if (event->keyval != GDK_KEY_Escape) return FALSE; panel_widget = panel_toplevel_get_panel_widget (drawer->toplevel); |