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

[Matthias Clasen <matthiasc src gnome org>]

commit 1e4c6cde100f4a3052b340cc1f40eaa85d58fd60
Merge: 372db8d239 74a452df6c
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Aug 26 18:02:18 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    Closes #3090
    
    See merge request GNOME/gtk!2485

 gdk/gdksurface.c | 25 ++++++++++++++++---------
 gdk/gdksurface.h |  2 +-
 gtk/gtkmain.c    |  7 +++++--
 gtk/gtkwidget.c  | 18 ++++++++++++++++++
 4 files changed, 40 insertions(+), 12 deletions(-)
---