Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-01 06:14:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove usage of __APPLE_QUARTZ__ (#673)

Browse Source
This commit is contained in:
ManoloFLTK
2023-02-06 21:42:29 +01:00
parent f1b2e92f07
commit 160eb2926d
5 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMake/setup.cmake
-1
View File
@@ -101,7 +101,6 @@ if (APPLE)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBCPP_HAS_THREAD_API_PTHREAD") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBCPP_HAS_THREAD_API_PTHREAD")
endif (NOT(${CMAKE_SYSTEM_VERSION} VERSION_LESS 17.0.0)) endif (NOT(${CMAKE_SYSTEM_VERSION} VERSION_LESS 17.0.0))
else () else ()
set (__APPLE_QUARTZ__ 1)
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa") set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa")
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework Cocoa") set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework Cocoa")
endif (OPTION_APPLE_X11) endif (OPTION_APPLE_X11)
configh.cmake.in
-10
View File
@@ -147,16 +147,6 @@
#cmakedefine01 HAVE_X11_XREGION_H #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: * HAVE_GL_OVERLAY:
* *
configh.in
-10
View File
@@ -146,16 +146,6 @@
#define HAVE_X11_XREGION_H 0 #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: * HAVE_GL_OVERLAY:
* *
configure.ac
-2
View File
@@ -952,8 +952,6 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [
HLINKS="#" HLINKS="#"
]) ])
], [darwin*], [ ], [darwin*], [
AC_DEFINE([__APPLE_QUARTZ__])
BUILD="OSX" BUILD="OSX"
# MacOS X uses Cocoa for graphics. # MacOS X uses Cocoa for graphics.
src/fl_overlay.cxx
+1 -1
View File
@@ -99,7 +99,7 @@ static void draw_current_rect() {
static void erase_current_rect() { static void erase_current_rect() {
#ifdef USE_XOR #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); fl_rect(px, py, pw, ph);
# else # else
draw_current_rect(); draw_current_rect();