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

[Matthias Clasen <matthiasc src gnome org>]

commit 3cc0870084ce240e491b25a860a075ce0616543d
Merge: 2a3c3b4c6a c442f9f05a
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Nov 10 16:59:47 2020 +0000

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

 gdk/wayland/gdksurface-wayland.c |  1 +
 gdk/win32/gdksurface-win32.c     |  1 +
 gdk/x11/gdkscreen-x11.c          |  7 +------
 gtk/gtkcolumnview.c              |  8 ++++++--
 gtk/gtkfontchooserwidget.c       | 11 +++++------
 gtk/gtkpagesetupunixdialog.c     |  2 ++
 6 files changed, 16 insertions(+), 14 deletions(-)
---