From dbe45ac2191d3d7180fb4fa50caf1763d4970374 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Mon, 3 Nov 2025 23:12:05 +0100
Subject: [PATCH 47/48] using more __WXDARWIN_OSX__

---
 include/wx/osx/core/private.h | 4 ++--
 include/wx/stdpaths.h         | 2 +-
 src/common/arrstr.cpp         | 2 +-
 src/unix/appunix.cpp          | 2 +-
 src/unix/utilsunx.cpp         | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index aa9e6aab01..8fb3fa6e39 100644
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -1056,11 +1056,11 @@ protected :
 // cocoa bridging utilities
 //---------------------------------------------------------------------------
 
-#if !defined(__WXOSX_IPHONE__)
+#ifdef __WXDARWIN_OSX__
 
 bool WXDLLIMPEXP_BASE wxMacInitCocoa();
 
-#endif // !defined(__WXOSX_IPHONE__)
+#endif // __WXDARWIN_OSX__
 
 class WXDLLIMPEXP_BASE wxMacAutoreleasePool
 {
diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h
index 42aa1f4e9f..b1d1cd5a8a 100644
--- a/include/wx/stdpaths.h
+++ b/include/wx/stdpaths.h
@@ -223,7 +223,7 @@ protected:
     #if defined(__WINDOWS__)
         #include "wx/msw/stdpaths.h"
         #define wxHAS_NATIVE_STDPATHS
-    #elif defined(__DARWIN__) || defined(__WXOSX_IPHONE__)
+    #elif defined(__DARWIN__)
         #include "wx/osx/core/stdpaths.h"
         #define wxHAS_NATIVE_STDPATHS
     #elif defined(__UNIX__)
diff --git a/src/common/arrstr.cpp b/src/common/arrstr.cpp
index 7899726a7a..bb3b6e4342 100644
--- a/src/common/arrstr.cpp
+++ b/src/common/arrstr.cpp
@@ -810,7 +810,7 @@ int wxCMPFUNC_CONV wxCmpNaturalGeneric(const wxString& s1, const wxString& s2)
 // ----------------------------------------------------------------------------
 
 // If native natural sort function isn't available, use the generic version.
-#if !(defined(__WINDOWS__) || defined(__DARWIN__) || defined(__WXOSX_IPHONE__))
+#if !(defined(__WINDOWS__) || defined(__DARWIN__))
 
 int wxCMPFUNC_CONV wxCmpNatural(const wxString& s1, const wxString& s2)
 {
diff --git a/src/unix/appunix.cpp b/src/unix/appunix.cpp
index 2dfb0b643a..e70d9d42ea 100644
--- a/src/unix/appunix.cpp
+++ b/src/unix/appunix.cpp
@@ -93,7 +93,7 @@ bool wxAppConsole::Initialize(int& argc_, wxChar** argv_)
 #ifdef __DARWIN__
     // On command line apps on macOS we need to initialize Cocoa framework
     wxMacAutoreleasePool autoreleasepool;
-#if !defined(__WXOSX_IPHONE__)
+#ifdef __WXDARWIN_OSX__
     wxMacInitCocoa();
 #endif
 #endif // __DARWIN__
diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 57088a259e..f4f96c953a 100644
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -489,7 +489,7 @@ private:
 // wxExecute implementations
 // ----------------------------------------------------------------------------
 
-#if defined(__DARWIN__) && !defined(__WXOSX_IPHONE__)
+#ifdef __WXDARWIN_OSX__
 bool wxCocoaLaunch(const char* const* argv, pid_t &pid);
 #endif
 
@@ -610,7 +610,7 @@ long wxExecute(const char* const* argv, int flags, wxProcess* process,
                     wxT("wxExecute() can be called only from the main thread") );
 #endif // wxUSE_THREADS
     pid_t pid;
-#if defined(__DARWIN__) && !defined(__WXOSX_IPHONE__)
+#ifdef __WXDARWIN_OSX__
     pid = -1;
     // wxCocoaLaunch() only executes app bundles and only does it asynchronously.
     // It returns false if the target is not an app bundle, thus falling
-- 
2.24.3 (Apple Git-128)