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

[Matthias Clasen <matthiasc src gnome org>]

commit 5a77994516e2dd858130c0593c7e5201b3efee97
Merge: 6142238237 3164f328b5
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Oct 29 18:55:53 2020 +0000

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

 docs/reference/gdk/gdk4-docs.xml      | 35 ++++++++++++++++-------
 docs/reference/gdk/gdk4-overrides.txt |  4 +--
 docs/reference/gdk/gdk4-sections.txt  |  7 ++---
 gdk/gdk.c                             |  6 ++--
 gdk/gdkcursor.c                       | 54 +++++++++++++++++++++--------------
 gdk/gdkcursor.h                       |  8 +++---
 gdk/gdkframeclock.c                   |  8 +++---
 gdk/gdkpaintable.c                    | 24 ++++++++--------
 gdk/gdkpopup.c                        |  6 +++-
 gdk/gdkrectangle.c                    | 18 ++++++------
 gdk/gdkrgba.c                         |  4 +--
 gdk/gdksurface.c                      | 11 +++++--
 gdk/gdktexture.c                      | 23 +++++++++------
 gdk/gdktoplevel.c                     |  6 ++++
 gdk/gdktypes.h                        | 14 ---------
 gdk/macos/GdkMacosWindow.c            |  1 +
 gdk/macos/edgesnapping.h              |  1 +
 gdk/macos/gdkmacosutils-private.h     |  8 ++++++
 gdk/x11/gdkmain-x11.c                 |  6 ++--
 testsuite/gtk/autotestkeywords.cc     |  4 +--
 20 files changed, 144 insertions(+), 104 deletions(-)
---