From 160eb2926d9dad336e37b5e4752fffea0c79bd13 Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Mon, 6 Feb 2023 21:42:29 +0100
Subject: Remove usage of __APPLE_QUARTZ__ (#673)

---
 CMake/setup.cmake  |  1 -
 configh.cmake.in   | 10 ----------
 configh.in         | 10 ----------
 configure.ac       |  2 --
 src/fl_overlay.cxx |  2 +-
 5 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/CMake/setup.cmake b/CMake/setup.cmake
index bc98aa58e..1ff5585ce 100644
--- a/CMake/setup.cmake
+++ b/CMake/setup.cmake
@@ -101,7 +101,6 @@ if (APPLE)
       set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBCPP_HAS_THREAD_API_PTHREAD")
     endif (NOT(${CMAKE_SYSTEM_VERSION} VERSION_LESS 17.0.0))
   else ()
-    set (__APPLE_QUARTZ__ 1)
     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa")
     set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework Cocoa")
   endif (OPTION_APPLE_X11)
diff --git a/configh.cmake.in b/configh.cmake.in
index d189d3bf9..99ff77ca8 100644
--- a/configh.cmake.in
+++ b/configh.cmake.in
@@ -147,16 +147,6 @@
 
 #cmakedefine01 HAVE_X11_XREGION_H
 
-/*
- * __APPLE_QUARTZ__:
- *
- * All Apple implementations are now based on Quartz and Cocoa,
- * so this flag should always be on for Mac OS X. This flag has
- * no meaning on operating systems other than Mac OS X.
- */
-
-#cmakedefine __APPLE_QUARTZ__ 1
-
 /*
  * HAVE_GL_OVERLAY:
  *
diff --git a/configh.in b/configh.in
index 091d06137..f8a6e39b2 100644
--- a/configh.in
+++ b/configh.in
@@ -146,16 +146,6 @@
 
 #define HAVE_X11_XREGION_H 0
 
-/*
- * __APPLE_QUARTZ__:
- *
- * All Apple implementations are now based on Quartz and Cocoa,
- * so this flag should always be on for Mac OS X. This flag has
- * no meaning on operating systems other than Mac OS X.
- */
-
-#undef __APPLE_QUARTZ__
-
 /*
  * HAVE_GL_OVERLAY:
  *
diff --git a/configure.ac b/configure.ac
index 16d5e2611..cf7c8837e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -952,8 +952,6 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [
         HLINKS="#"
     ])
 ], [darwin*], [
-    AC_DEFINE([__APPLE_QUARTZ__])
-
     BUILD="OSX"
 
     # MacOS X uses Cocoa for graphics.
diff --git a/src/fl_overlay.cxx b/src/fl_overlay.cxx
index 0c2d0db11..a4bacb493 100644
--- a/src/fl_overlay.cxx
+++ b/src/fl_overlay.cxx
@@ -99,7 +99,7 @@ static void draw_current_rect() {
 
 static void erase_current_rect() {
 #ifdef USE_XOR
-# ifdef __APPLE_QUARTZ__ // PORTME: Fl_Window_Driver - platform overlay
+# ifdef __APPLE__ // PORTME: Fl_Window_Driver - platform overlay
   fl_rect(px, py, pw, ph);
 # else
   draw_current_rect();
-- 
cgit v1.2.3