From 6833b0e9343e0118a921a4967de3c944c6fd00f4 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 13 Jul 2020 10:51:12 +0200 Subject: [PATCH] adding combined macOS iOS version guards --- include/wx/osx/private/available.h | 11 +++++++++++ src/osx/core/colour.cpp | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/include/wx/osx/private/available.h b/include/wx/osx/private/available.h index a4f6ecb290..a9e7cf894e 100644 --- a/include/wx/osx/private/available.h +++ b/include/wx/osx/private/available.h @@ -18,6 +18,9 @@ #define WX_IS_MACOS_AVAILABLE(major, minor) \ __builtin_available(macOS major ## . ## minor, *) + #define WX_IS_MACOS_OR_IOS_AVAILABLE(macmajor, macminor, imajor, iminor) \ + __builtin_available(macOS macmajor ## . ## macminor, iOS imajor ##. ## iminor, *) + #define WX_IS_MACOS_AVAILABLE_FULL(major, minor, micro) \ __builtin_available(macOS major ## . ## minor ## . ## micro, *) @@ -31,6 +34,14 @@ #define WX_IS_MACOS_AVAILABLE(major, minor) \ wxPlatformInfo::Get().CheckOSVersion(major, minor) +#ifdef wxOSX_USE_IPHONE + #define WX_IS_MACOS_OR_IOS_AVAILABLE(macmajor, macminor, imajor, iminor) \ + wxPlatformInfo::Get().CheckOSVersion(imajor, iminor) +#else + #define WX_IS_MACOS_OR_IOS_AVAILABLE(macmajor, macminor, imajor, iminor) \ + wxPlatformInfo::Get().CheckOSVersion(macmajor, macminor) +#endif + #define WX_IS_MACOS_AVAILABLE_FULL(major, minor, micro) \ wxPlatformInfo::Get().CheckOSVersion(major, minor, micro) diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp index 17d80c629f..46ceffae2b 100644 --- a/src/osx/core/colour.cpp +++ b/src/osx/core/colour.cpp @@ -118,7 +118,7 @@ wxCGColorRefData::wxCGColorRefData(CGColorRef col) } else if (model != kCGColorSpaceModelRGB) { - if ( WX_IS_MACOS_AVAILABLE(10, 11) ) + if ( WX_IS_MACOS_OR_IOS_AVAILABLE(10, 11, 9, 0) ) { rgbacol = CGColorCreateCopyByMatchingToColorSpace(wxMacGetGenericRGBColorSpace(), kCGRenderingIntentDefault, col, NULL); noComp = CGColorGetNumberOfComponents(rgbacol);