[gtk: 18/18] Merge branch 'wip/chergert/for-main' into 'main'

[Matthias Clasen <matthiasc src gnome org>]

commit 8186cb8bee30522943f97c9896df32c0fcd2b87a
Merge: 9b8f28903b 166444f115
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Mar 12 19:07:41 2022 +0000

    Merge branch 'wip/chergert/for-main' into 'main'
    
    macos: fit'n'finish fixes for main
    
    See merge request GNOME/gtk!4564

 gdk/macos/GdkMacosView.c              | 14 ++++++
 gdk/macos/GdkMacosWindow.c            | 25 +++++++++--
 gdk/macos/GdkMacosWindow.h            |  1 +
 gdk/macos/gdkmacosdisplay-private.h   | 10 +++++
 gdk/macos/gdkmacosdisplay-translate.c | 42 ++++++++++++++---
 gdk/macos/gdkmacosdisplay.c           | 85 +++++++++++++++++++----------------
 gdk/macos/gdkmacospopupsurface.c      | 32 ++++++++++---
 gdk/macos/gdkmacossurface.c           | 11 ++++-
 gtk/gtkfilechoosernativequartz.c      |  4 ++
 9 files changed, 167 insertions(+), 57 deletions(-)
---