[gtk: 10/10] Merge branch 'wip/chergert/gdk-macos-fixes' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 035e303f839217e10d1f53a192ba7d0de046dec7
Merge: 91ba0a31e7 07bb07abbe
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Oct 10 11:55:01 2020 +0000

    Merge branch 'wip/chergert/gdk-macos-fixes' into 'master'
    
    various build fixes for GDK/GTK on macos
    
    See merge request GNOME/gtk!2680

 gdk/macos/GdkMacosBaseView.c          |  13 ---
 gdk/macos/GdkMacosWindow.c            |   3 +-
 gdk/macos/gdkmacosdevice.c            |   3 +-
 gdk/macos/gdkmacosdisplay-private.h   |  14 +++
 gdk/macos/gdkmacosdisplay-translate.c |  20 +---
 gdk/macos/gdkmacosdisplay.c           |  69 +++++++++--
 gdk/macos/gdkmacoskeymap-private.h    |   1 +
 gdk/macos/gdkmacoskeymap.c            | 147 +++++++++++++++++++++++
 gdk/macos/gdkmacosmonitor.h           |  11 +-
 gdk/macos/gdkmacospopupsurface.c      |   3 +-
 gdk/macos/gdkmacossurface.c           |   3 +-
 gdk/macos/gdkmacostoplevelsurface.c   |   5 +-
 gdk/macos/meson.build                 |   1 +
 gdk/meson.build                       |   2 +-
 gtk/gentypefuncs.py                   |   2 +-
 gtk/gtkaccelgroup.c                   |  14 +--
 gtk/gtkapplication-quartz-menu.c      |  26 +++--
 gtk/gtkapplication-quartz.c           |  55 ++++-----
 gtk/gtkapplicationimpl.c              |   8 +-
 gtk/gtkfilechoosernative.c            |   4 +-
 gtk/gtkfilechoosernativequartz.c      |  18 +--
 gtk/gtkfilefilter.c                   |   2 +-
 gtk/gtkfilefilterprivate.h            |   4 +-
 gtk/gtkimcontextquartz.c              | 111 ++++++++++--------
 gtk/gtkimcontextquartz.h              |   2 +-
 gtk/gtkimmodule.c                     |  20 ++--
 gtk/gtkprivate.c                      |   2 +-
 gtk/gtkquartz.c                       | 214 +---------------------------------
 gtk/gtkquartz.h                       |  31 ++---
 gtk/gtkrange.c                        |   2 +-
 gtk/gtkscrolledwindow.c               |   2 +-
 gtk/gtksearchengine.c                 |   4 +-
 gtk/gtksearchenginequartz.c           |   4 +-
 gtk/gtksettings.c                     |  11 +-
 gtk/inspector/general.c               |  12 +-
 gtk/inspector/visual.c                |   2 +-
 gtk/meson.build                       |  14 ++-
 meson.build                           |   7 +-
 38 files changed, 431 insertions(+), 435 deletions(-)
---