[gtk-vnc] Cleanup Gtk2 leftovers

[Daniel P. Berrange <dberrange src gnome org>]

commit 78225889ce861c0d3ea4aa97603fef252817505f
Author: Marc-André Lureau <marcandre lureau gmail com>
Date:   Wed Mar 24 12:45:27 2021 +0400

    Cleanup Gtk2 leftovers
    
    Signed-off-by: Marc-André Lureau <marcandre lureau redhat com>

 README                 | 14 --------------
 src/vncdisplay.c       | 12 ++----------
 src/vncdisplaykeymap.c | 20 --------------------
 3 files changed, 2 insertions(+), 44 deletions(-)
---
diff --git a/README b/README
index caab440..d6b79f7 100644
--- a/README
+++ b/README
@@ -27,20 +27,6 @@ To browse or report bugs, go to our bug tracker page at:
 Installation notes
 ------------------
 
- * GTK2/GTK3: The build currently defaults to using GTK3.
-   To enable legacy GTK2 support the flag '--with-gtk=2.0' must
-   be passed to configure.
-
-         ./configure --with-gtk=2.0
-
-   Note that when built against GTK3 the library name for gtk-vnc
-   will become 'gtk-vnc-2.0.so' and the pkg-config file will
-   also be 'gtk-vnc-2.0', rather than 'gtk-vnc-1.0.so' and 'gtk-vnc-1.0'
-   for the GTK2 build.
-
-   The gvnc library is unaffected by GTK2/GTK3 build choice since it
-   only depends on GLib/GIO
-
  * NetBSD: You must run configure using
 
     --with-coroutine=gthread
diff --git a/src/vncdisplay.c b/src/vncdisplay.c
index 3680e26..0042faa 100644
--- a/src/vncdisplay.c
+++ b/src/vncdisplay.c
@@ -902,14 +902,6 @@ static gboolean check_for_grab_key(GtkWidget *widget, int type, int keyval)
 }
 
 
-/* Compatability code to allow build on Gtk2 and Gtk3 */
-#ifndef GDK_Tab
-#define GDK_Tab GDK_KEY_Tab
-#endif
-#ifndef GDK_ISO_Left_Tab
-#define GDK_ISO_Left_Tab GDK_KEY_ISO_Left_Tab
-#endif
-
 static gboolean key_event(GtkWidget *widget, GdkEventKey *key)
 {
     VncDisplayPrivate *priv = VNC_DISPLAY(widget)->priv;
@@ -943,8 +935,8 @@ static gboolean key_event(GtkWidget *widget, GdkEventKey *key)
      * They need the Tab key and will apply the
      * Shift modifier themselves
      */
-    if (keyval == GDK_ISO_Left_Tab) {
-        keyval = GDK_Tab;
+    if (keyval == GDK_KEY_ISO_Left_Tab) {
+        keyval = GDK_KEY_Tab;
     }
 
     /*
diff --git a/src/vncdisplaykeymap.c b/src/vncdisplaykeymap.c
index fe96252..c964884 100644
--- a/src/vncdisplaykeymap.c
+++ b/src/vncdisplaykeymap.c
@@ -54,42 +54,22 @@
 #include "vncdisplaykeymap_xorgxquartz2qnum.h"
 /* Xorg Cygwin aka XWin (offset + mangled XT keycodes) */
 #include "vncdisplaykeymap_xorgxwin2qnum.h"
-
-/* Gtk2 compat */
-#ifndef GDK_IS_X11_DISPLAY
-#define GDK_IS_X11_DISPLAY(dpy) (dpy != NULL)
-#endif
 #endif
 
 #ifdef GDK_WINDOWING_WIN32
 /* Win32 native virtual keycodes */
 #include "vncdisplaykeymap_win322qnum.h"
-
-/* Gtk2 compat */
-#ifndef GDK_IS_WIN32_DISPLAY
-#define GDK_IS_WIN32_DISPLAY(dpy) (dpy != NULL)
-#endif
 #endif
 
 #ifdef GDK_WINDOWING_BROADWAY
 /* X11 keysyms */
 #include "vncdisplaykeymap_x112qnum.h"
 
-/* Gtk2 compat */
-#ifndef GDK_IS_BROADWAY_DISPLAY
-#define GDK_IS_BROADWAY_DISPLAY(dpy) (dpy != NULL)
-#endif
-
 #endif
 
 #ifdef GDK_WINDOWING_QUARTZ
 /* OS-X native keycodes */
 #include "vncdisplaykeymap_osx2qnum.h"
-
-/* Gtk2 compat */
-#ifndef GDK_IS_QUARTZ_DISPLAY
-#define GDK_IS_QUARTZ_DISPLAY(dpy) (dpy != NULL)
-#endif
 #endif
 
 #ifdef GDK_WINDOWING_X11