From dd0e8ffd90f41160485f31a669892fe61adaa0d4 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 22 Oct 2025 22:54:58 +0200 Subject: [PATCH 03/48] swapping order as TARGET_OS_IPHONE is subclass of TARGET_OS_MAC --- include/wx/defs.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 236b6293b8..49d750e22c 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -2756,7 +2756,16 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSString); DECLARE_WXCOCOA_OBJC_CLASS(NSObject); DECLARE_WXCOCOA_OBJC_CLASS(NSSet); -#if defined(TARGET_OS_MAC) && TARGET_OS_MAC +#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE + +DECLARE_WXCOCOA_OBJC_CLASS(UIColor); +DECLARE_WXCOCOA_OBJC_CLASS(UIImage); +DECLARE_WXCOCOA_OBJC_CLASS(UIFont); + +typedef WX_UIColor WXColor; +typedef WX_UIImage WXImage; + +#elif defined(TARGET_OS_MAC) && TARGET_OS_MAC DECLARE_WXCOCOA_OBJC_CLASS(NSBitmapImageRep); DECLARE_WXCOCOA_OBJC_CLASS(NSColor); @@ -2769,15 +2778,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSThread); typedef WX_NSColor WXColor; typedef WX_NSImage WXImage; -#elif defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE - -DECLARE_WXCOCOA_OBJC_CLASS(UIColor); -DECLARE_WXCOCOA_OBJC_CLASS(UImage); -DECLARE_WXCOCOA_OBJC_CLASS(UIFont); - -typedef WX_UIColor WXColor; -typedef WX_UIImage WXImage; - +#elif #else #endif -- 2.24.3 (Apple Git-128)