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

[Matthias Clasen <matthiasc src gnome org>]

commit 85394b04e06b34d51aa44b345e58d5163c1e9d37
Merge: a772d8fcac 9f01d4fe44
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Oct 14 19:10:11 2020 +0000

    Merge branch 'wip/chergert/gdk-macos-fixes' into 'master'
    
    GTK4: fix macos device state query for surfaces
    
    See merge request GNOME/gtk!2690

 gdk/macos/gdkmacosdisplay-translate.c |  3 ++-
 gdk/macos/gdkmacosdisplay.c           |  8 +++++---
 gdk/macos/gdkmacossurface.c           | 16 ++++++++--------
 gtk/gtkfilechoosernativequartz.c      |  6 +++++-
 4 files changed, 20 insertions(+), 13 deletions(-)
---