[gtk: 21/21] Merge branch 'matthiasc/for-master' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 70ae073394caf836fc48bc964740a9ba5c28e052
Merge: 1e4c6cde10 1c44910dfe
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Aug 26 22:34:08 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    See merge request GNOME/gtk!2488

 gdk/broadway/gdkdevice-broadway.c       | 50 +++++++++++++++++----------------
 gdk/broadway/gdkdevice-broadway.h       |  6 ++++
 gdk/broadway/gdksurface-broadway.c      | 10 +++----
 gdk/gdkdevice.c                         | 16 -----------
 gdk/gdkdeviceprivate.h                  | 17 -----------
 gdk/gdksurfaceprivate.h                 | 12 ++++----
 gdk/macos/gdkmacosdevice-private.h      | 36 ++++++++++++++++++++++++
 gdk/macos/gdkmacosdevice.c              |  5 ++--
 gdk/macos/gdkmacosdrag.c                |  3 +-
 gdk/macos/gdkmacossurface.c             |  3 +-
 gdk/wayland/gdkdevice-wayland-private.h | 13 +++++++++
 gdk/wayland/gdkdevice-wayland.c         | 29 ++++++++++---------
 gdk/wayland/gdksurface-wayland.c        | 20 ++++---------
 gdk/win32/gdkdevice-virtual.c           | 11 ++++----
 gdk/win32/gdkdevice-virtual.h           |  9 ++++++
 gdk/win32/gdkdevice-win32.c             | 19 ++++++++++++-
 gdk/win32/gdkdevice-win32.h             |  7 +++++
 gdk/win32/gdkdevice-wintab.c            |  3 +-
 gdk/win32/gdkdevice-wintab.h            |  8 ++++++
 gdk/win32/gdkdrag-win32.c               |  5 ++--
 gdk/win32/gdksurface-win32.c            | 18 +++++-------
 gdk/x11/gdkdevice-xi2-private.h         |  9 ++++++
 gdk/x11/gdkdevice-xi2.c                 | 14 ++-------
 gdk/x11/gdkdrag-x11.c                   |  5 ++--
 gdk/x11/gdksurface-x11.c                | 21 ++++++--------
 25 files changed, 198 insertions(+), 151 deletions(-)
---