diff options
| author | Francois Gouget <fgouget@codeweavers.com> | 2016-10-27 18:41:43 +0200 |
|---|---|---|
| committer | Victor Toso <me@victortoso.com> | 2016-10-31 17:13:30 +0100 |
| commit | 9ff67a108bb76e50a2c85a5054e6521088df1800 (patch) | |
| tree | 553036460519726ad86eea111362ba1029fd9c7a | |
| parent | 9b9a6878b935806c831d3561cfa2cd6266368d6c (diff) | |
vncdisplaykeymap: Remove obsolete GTK+ 2 compatibility macros
Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
| -rw-r--r-- | src/vncdisplaykeymap.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/src/vncdisplaykeymap.c b/src/vncdisplaykeymap.c index c50f9f7..d0c9739 100644 --- a/src/vncdisplaykeymap.c +++ b/src/vncdisplaykeymap.c @@ -45,11 +45,6 @@ */ -/* Compatability code to allow build on Gtk2 and Gtk3 */ -#ifndef GDK_Tab -#define GDK_Tab GDK_KEY_Tab -#endif - /* keycode translation for sending ISO_Left_Send * to vncserver */ @@ -57,7 +52,7 @@ static struct { GdkKeymapKey *keys; gint n_keys; guint keyval; -} untranslated_keys[] = {{NULL, 0, GDK_Tab}}; +} untranslated_keys[] = {{NULL, 0, GDK_KEY_Tab}}; static unsigned int ref_count_for_untranslated_keys = 0; @@ -87,41 +82,21 @@ static unsigned int ref_count_for_untranslated_keys = 0; /* Xorg Cygwin aka XWin (offset + mangled XT keycodes) */ #include "vncdisplaykeymap_xorgxwin2xtkbd.c" -/* Gtk2 compat */ -#ifndef GDK_IS_X11_WINDOW -#define GDK_IS_X11_WINDOW(win) (1) -#endif #endif #ifdef GDK_WINDOWING_WIN32 /* Win32 native virtual keycodes */ #include "vncdisplaykeymap_win322xtkbd.c" - -/* Gtk2 compat */ -#ifndef GDK_IS_WIN32_WINDOW -#define GDK_IS_WIN32_WINDOW(win) (1) -#endif #endif #ifdef GDK_WINDOWING_QUARTZ /* OS-X native keycodes */ #include "vncdisplaykeymap_osx2xtkbd.c" - -/* Gtk2 compat */ -#ifndef GDK_IS_QUARTZ_WINDOW -#define GDK_IS_QUARTZ_WINDOW(win) (1) -#endif #endif #ifdef GDK_WINDOWING_BROADWAY /* X11 keysyms */ #include "vncdisplaykeymap_x112xtkbd.c" - -/* Gtk2 compat */ -#ifndef GDK_IS_BROADWAY_WINDOW -#define GDK_IS_BROADWAY_WINDOW(win) (1) -#endif - #endif #ifdef GDK_WINDOWING_X11 |