[gtk/wip/chergert/quartz4u: 4/7] macos: update docs to reference GDK_WINDOWING_MACOS

[Christian Hergert <chergert src gnome org>]

commit bcf6ea175a77d7782ff37982bb5ac0248e2cc6b0
Author: Christian Hergert <chergert redhat com>
Date:   Tue Jul 21 17:58:17 2020 -0700

    macos: update docs to reference GDK_WINDOWING_MACOS

 docs/reference/gdk/gdk4-overrides.txt |  4 ++--
 docs/reference/gdk/gdk4-sections.txt  |  2 +-
 gdk/gdk.c                             |  6 +++---
 gdk/gdkdisplaymanager.c               | 16 +++-------------
 gdk/x11/gdkmain-x11.c                 |  6 +++---
 5 files changed, 12 insertions(+), 22 deletions(-)
---
diff --git a/docs/reference/gdk/gdk4-overrides.txt b/docs/reference/gdk/gdk4-overrides.txt
index 4123476674..5dab67c7c9 100644
--- a/docs/reference/gdk/gdk4-overrides.txt
+++ b/docs/reference/gdk/gdk4-overrides.txt
@@ -10,8 +10,8 @@
 </MACRO>
 
 <MACRO>
-<NAME>GDK_WINDOWING_QUARTZ</NAME>
-#define GDK_WINDOWING_QUARTZ
+<NAME>GDK_WINDOWING_MACOS</NAME>
+#define GDK_WINDOWING_MACOS
 </MACRO>
 
 <MACRO>
diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index d926d1b8b0..2c750c2d92 100644
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -8,7 +8,7 @@
 <SUBSECTION>
 GDK_WINDOWING_X11
 GDK_WINDOWING_WIN32
-GDK_WINDOWING_QUARTZ
+GDK_WINDOWING_MACOS
 GDK_WINDOWING_WAYLAND
 
 <SUBSECTION>
diff --git a/gdk/gdk.c b/gdk/gdk.c
index e32e60ec31..eedcd84a29 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -88,12 +88,12 @@
  */
 
 /**
- * GDK_WINDOWING_QUARTZ:
+ * GDK_WINDOWING_MACOS:
  *
- * The #GDK_WINDOWING_QUARTZ macro is defined if the Quartz backend
+ * The #GDK_WINDOWING_MACOS macro is defined if the macOS backend
  * is supported.
  *
- * Use this macro to guard code that is specific to the Quartz backend.
+ * Use this macro to guard code that is specific to the macOS backend.
  */
 
 /**
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index a17305fcbe..b9e797a93c 100644
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -36,16 +36,6 @@
 #include "x11/gdkprivate-x11.h"
 #endif
 
-#ifdef GDK_WINDOWING_QUARTZ
-/* When the gdk_quartz_display_open function is removed We can
- * immediately include gdkquartzdisplaymanager.h here instead of
- * gdkprivate-quartz.h so that we won’t have to enable -xobjective-c
- * for the “generic” GDK source code.
- * #include "quartz/gdkquartzdisplaymanager.h"
- */
-#include "quartz/gdkprivate-quartz.h"
-#endif
-
 #ifdef GDK_WINDOWING_BROADWAY
 #include "broadway/gdkprivate-broadway.h"
 #endif
@@ -98,10 +88,10 @@
  *     }
  *   else
  * #endif
- * #ifdef GDK_WINDOWING_QUARTZ
- *   if (GDK_IS_QUARTZ_DISPLAY (display))
+ * #ifdef GDK_WINDOWING_MACOS
+ *   if (GDK_IS_MACOS_DISPLAY (display))
  *     {
- *       // make Quartz-specific calls here
+ *       // make macOS-specific calls here
 *     }
  *   else
  * #endif
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 62cbf7b654..49b14a974d 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -68,10 +68,10 @@
  *     }
  *   else
  * #endif
- * #ifdef GDK_WINDOWING_QUARTZ
- *   if (GDK_IS_QUARTZ_DISPLAY (display))
+ * #ifdef GDK_WINDOWING_MACOS
+ *   if (GDK_IS_MACOS_DISPLAY (display))
  *     {
- *       // make Quartz-specific calls here
+ *       // make macOS-specific calls here
  *     }
  *   else
  * #endif