[gtk: 3/3] Merge branch 'display-cleanup' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 0b11e78064cc51ed636fab83fb6406a6e4e33d19
Merge: e8026e29b6 488722e7c4
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jul 30 03:55:23 2020 +0000

    Merge branch 'display-cleanup' into 'master'
    
    Display cleanup
    
    See merge request GNOME/gtk!2319

 docs/reference/gdk/gdk4-sections.txt |  2 +-
 gdk/broadway/gdkdisplay-broadway.c   |  9 ---------
 gdk/gdkdisplay.c                     | 23 +++--------------------
 gdk/gdkdisplay.h                     |  3 ---
 gdk/gdkdisplayprivate.h              |  1 -
 gdk/wayland/gdkdisplay-wayland.c     |  9 ---------
 gdk/win32/gdkdisplay-win32.c         | 11 -----------
 gdk/x11/gdkdisplay-x11.c             | 14 ++++++++++++--
 gdk/x11/gdksurface-x11.c             |  2 +-
 gdk/x11/gdkx11display.h              |  3 +++
 10 files changed, 20 insertions(+), 57 deletions(-)
---