[gtk/gtk-3-24: 2/2] Merge branch 'no-objc' into 'gtk-3-24'

[Matthias Clasen <matthiasc src gnome org>]

commit f0002ad37250cd851463e9bc9fde83f393cd12bd
Merge: 61d7700c17 ef72fe750a
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Nov 27 13:39:40 2019 +0000

    Merge branch 'no-objc' into 'gtk-3-24'
    
    Hide Objective-C from outside GdkQuartz.
    
    See merge request GNOME/gtk!641

 gdk/Makefile.am                       |   1 -
 gdk/gdkdisplaymanager.c               |   6 -
 gdk/quartz/GdkQuartzNSWindow.c        |   2 +
 gdk/quartz/GdkQuartzView.c            |   1 +
 gdk/quartz/Makefile.am                |   2 +
 gdk/quartz/gdkcursor-quartz.c         |   1 +
 gdk/quartz/gdkdevice-core-quartz.c    |   1 +
 gdk/quartz/gdkdisplay-quartz.h        |   1 +
 gdk/quartz/gdkdnd-quartz.c            |   3 +-
 gdk/quartz/gdkdnd-quartz.h            |   1 -
 gdk/quartz/gdkeventloop-quartz.c      |  13 ++
 gdk/quartz/gdkevents-quartz.c         |   3 +
 gdk/quartz/gdkglobals-quartz.c        |   1 +
 gdk/quartz/gdkinternal-quartz.h       | 265 ++++++++++++++++++++++++++++++++++
 gdk/quartz/gdkkeys-quartz.c           |   2 +
 gdk/quartz/gdkkeys-quartz.h           |  85 +++++++++++
 gdk/quartz/gdkmonitor-quartz.c        |   1 -
 gdk/quartz/gdkmonitor-quartz.h        |   1 +
 gdk/quartz/gdkprivate-quartz.h        | 214 +--------------------------
 gdk/quartz/gdkquartz-gtk-only.h       |  50 +++++++
 gdk/quartz/gdkquartz.h                |  23 ---
 gdk/quartz/gdkquartzdnd.h             |   4 +-
 gdk/quartz/gdkquartzkeys.h            |  73 ----------
 gdk/quartz/gdkquartzutils.h           |   4 -
 gdk/quartz/gdkquartzwindow.h          |   5 -
 gdk/quartz/gdkselection-quartz.c      |   1 +
 gdk/quartz/gdkutils-quartz.c          |   5 +-
 gdk/quartz/gdkwindow-quartz.c         |   2 +
 gdk/quartz/gdkwindow-quartz.h         |   2 +-
 gtk/deprecated/gtkstatusicon-quartz.c |   4 +-
 gtk/gtkclipboard-quartz.c             |   2 +-
 gtk/gtkdnd-quartz.c                   |   2 +
 gtk/gtkfilechoosernativequartz.c      |   3 +-
 gtk/gtkquartz.c                       |   2 +-
 modules/input/imquartz.c              |   5 +-
 35 files changed, 452 insertions(+), 339 deletions(-)
---
diff --cc gtk/gtkfilechoosernativequartz.c
index c1b7225ca8,b81b48d4af..680c7f1381
--- a/gtk/gtkfilechoosernativequartz.c
+++ b/gtk/gtkfilechoosernativequartz.c
@@@ -40,10 -40,8 +40,9 @@@
  #include "gtklabel.h"
  #include "gtkfilechooserentry.h"
  #include "gtkfilefilterprivate.h"
- 
- #include "quartz/gdkquartz.h"
+ #include <quartz/gdkquartz-gtk-only.h>
  
 +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
  typedef struct {
    GtkFileChooserNative *self;