[gtk: 13/13] Merge branch 'wip/otte/gdk-headers' into 'master'

[Benjamin Otte <otte src gnome org>]

commit 555993717b3c1bf6215a37404ea29bd40167c7e7
Merge: 7e48ab4ccd a29474567a
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Fri Sep 24 21:16:55 2021 +0000

    Merge branch 'wip/otte/gdk-headers' into 'master'
    
    Clean up GDK headers
    
    See merge request GNOME/gtk!3996

 gdk/broadway/broadway-server.c            |   2 +-
 gdk/broadway/gdkbroadway-server.h         |   4 +-
 gdk/broadway/gdkdisplay-broadway.c        |   1 -
 gdk/broadway/gdkdisplay-broadway.h        |   1 -
 gdk/broadway/gdkdnd-broadway.c            |   1 -
 gdk/broadway/gdkeventsource.c             |   3 +-
 gdk/broadway/gdkkeys-broadway.c           |   1 -
 gdk/broadway/gdkprivate-broadway.h        |   1 -
 gdk/broadway/gdksurface-broadway.c        |   3 +-
 gdk/broadway/gdksurface-broadway.h        |   1 -
 gdk/gdk-private.h                         |   3 +-
 gdk/gdk.c                                 |  13 +--
 gdk/gdkapplaunchcontext.h                 |   2 +-
 gdk/gdkcairo.c                            |   4 +-
 gdk/gdkcairocontext.c                     |   1 -
 gdk/gdkcairoprivate.h                     |   2 +
 gdk/gdkcursor.c                           |   1 -
 gdk/gdkdebug.h                            |   5 +-
 gdk/gdkdevice.c                           |   1 -
 gdk/gdkdevicetool.c                       |   2 +-
 gdk/gdkdisplay.c                          |   8 +-
 gdk/gdkdisplaymanager.c                   |   1 -
 gdk/gdkdrawcontext.c                      |   2 +-
 gdk/gdkdrop.c                             |   2 +-
 gdk/gdkevents.c                           |   6 +-
 gdk/gdkframeclock.c                       |   1 -
 gdk/gdkframeclockidle.c                   |   3 +-
 gdk/gdkgl.c                               |   4 +-
 gdk/gdkglcontext.c                        |   1 -
 gdk/gdkglobals.c                          |   1 -
 gdk/gdkhslaprivate.h                      |   2 +-
 gdk/gdkinternals.h                        |  43 ----------
 gdk/gdkkeynames.c                         |   1 -
 gdk/gdkpixbuf-drawable.c                  |   1 -
 gdk/gdkseat.c                             |   1 -
 gdk/gdkseatdefault.c                      |   1 -
 gdk/gdksurface.c                          |   7 +-
 gdk/gdktexture.c                          |   1 -
 gdk/gdktoplevel.c                         |  10 ++-
 gdk/gdkvulkancontext.c                    |   1 -
 gdk/gdkvulkancontextprivate.h             |   2 +-
 gdk/macos/GdkMacosBaseView.c              |   4 +-
 gdk/macos/GdkMacosCairoSubview.c          |   1 -
 gdk/macos/GdkMacosCairoView.c             |   1 -
 gdk/macos/GdkMacosGLView.c                |   1 -
 gdk/macos/GdkMacosWindow.c                |   1 +
 gdk/macos/gdkmacosdisplay-translate.c     |   2 +
 gdk/macos/gdkmacosdrag.c                  |  11 ++-
 gdk/macos/gdkmacoseventsource.c           |   4 +-
 gdk/macos/gdkmacosglcontext-private.h     |   1 -
 gdk/macos/gdkmacosglcontext.c             |   3 +-
 gdk/macos/gdkmacospopupsurface.c          |   5 +-
 gdk/macos/gdkmacossurface-private.h       |   1 -
 gdk/macos/gdkmacossurface.c               |   6 +-
 gdk/macos/gdkmacostoplevelsurface.c       |   5 +-
 gdk/wayland/gdkapplaunchcontext-wayland.c |   1 -
 gdk/wayland/gdkcairocontext-wayland.c     |   1 -
 gdk/wayland/gdkdevice-wayland.c           |  25 +++---
 gdk/wayland/gdkdisplay-wayland.h          |   1 -
 gdk/wayland/gdkdrag-wayland.c             |   1 -
 gdk/wayland/gdkdrop-wayland.c             |   1 -
 gdk/wayland/gdkeventsource.c              |   3 +-
 gdk/wayland/gdkglcontext-wayland.c        |   1 -
 gdk/wayland/gdkglcontext-wayland.h        |   1 -
 gdk/wayland/gdkprivate-wayland.h          |   1 -
 gdk/wayland/gdksurface-wayland.c          |   1 +
 gdk/wayland/gdkvulkancontext-wayland.c    |   1 -
 gdk/win32/gdkcairocontext-win32.c         |   7 --
 gdk/win32/gdkclipboard-win32.c            |   1 +
 gdk/win32/gdkclipdrop-win32.c             |   9 +-
 gdk/win32/gdkdevicemanager-win32.c        |   1 +
 gdk/win32/gdkdisplay-win32.c              |   2 +
 gdk/win32/gdkdisplaymanager-win32.c       |   1 -
 gdk/win32/gdkdrag-win32.c                 |  11 +--
 gdk/win32/gdkdrop-win32.c                 | 132 ------------------------------
 gdk/win32/gdkevents-win32.c               |   7 +-
 gdk/win32/gdkglcontext-win32-egl.c        |   1 -
 gdk/win32/gdkglcontext-win32-wgl.c        |   9 --
 gdk/win32/gdkglcontext-win32.c            |   1 -
 gdk/win32/gdkglcontext-win32.h            |   1 -
 gdk/win32/gdkhdataoutputstream-win32.c    |   1 -
 gdk/win32/gdkkeys-win32.c                 |  18 ++--
 gdk/win32/gdkmain-win32.c                 |   2 +-
 gdk/win32/gdkprivate-win32.h              |   1 -
 gdk/win32/gdksurface-win32.h              |   1 -
 gdk/win32/gdkwin32dnd-private.h           |   2 +
 gdk/x11/gdkcairocontext-x11.c             |   1 -
 gdk/x11/gdkdevice-xi2.c                   |  23 +++++-
 gdk/x11/gdkdevicemanager-x11.c            |   1 -
 gdk/x11/gdkdevicemanager-xi2.c            |   2 +-
 gdk/x11/gdkdisplay-x11.c                  |   2 +-
 gdk/x11/gdkdisplay-x11.h                  |   1 -
 gdk/x11/gdkdrag-x11.c                     |   3 +-
 gdk/x11/gdkdrop-x11.c                     |   1 -
 gdk/x11/gdkeventsource.c                  |   3 +-
 gdk/x11/gdkeventtranslator.h              |   3 +-
 gdk/x11/gdkglcontext-egl.c                |   1 -
 gdk/x11/gdkglcontext-glx.c                |   1 -
 gdk/x11/gdkglcontext-x11.c                |   2 -
 gdk/x11/gdkglcontext-x11.h                |   1 -
 gdk/x11/gdkmain-x11.c                     |  22 -----
 gdk/x11/gdkprivate-x11.h                  |   6 +-
 gdk/x11/gdkproperty-x11.c                 |   1 -
 gdk/x11/gdksurface-x11.c                  |   3 +-
 gdk/x11/gdksurface-x11.h                  |   1 -
 gdk/x11/gdkvulkancontext-x11.c            |   1 -
 gdk/x11/gdkxftdefaults.c                  |   2 +
 gdk/x11/xsettings-client.c                |   2 -
 gtk/gtkimcontext.c                        |   2 +
 gtk/gtkimcontextsimple.c                  |   2 +
 gtk/gtkmain.c                             |   3 +
 gtk/gtkpopover.c                          |   2 +
 gtk/gtkwindow.c                           |   4 +-
 gtk/inspector/general.c                   |   1 +
 gtk/inspector/logs.c                      |   2 +-
 gtk/inspector/visual.c                    |   2 +-
 gtk/inspector/window.c                    |   2 +-
 117 files changed, 170 insertions(+), 376 deletions(-)
---