From c7643cefe076eff30a6a652f00563e64130f0f29 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Wed, 2 Oct 2019 20:37:46 +0200 Subject: [PATCH] Avoid compilation warnings under OS X 10.11 Warnings about incompatible pointer are generated with 10.11 SDK so function arguments should be constrained also for this SDK version. --- src/osx/cocoa/window.mm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index 0eee46be33..ef0a0ba623 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -2843,11 +2843,11 @@ bool wxWidgetCocoaImpl::ShowWithEffect(bool show, return ShowViewOrWindowWithEffect(m_wxPeer, show, effect, timeout); } -// To avoid warnings about incompatible pointer types with macOS 10.12 SDK (and -// maybe even earlier? This has changed at some time between 10.9 and 10.12), +// To avoid warnings about incompatible pointer types with OS X 10.11 SDK (and +// maybe even earlier? This has changed at some time between 10.9 and 10.11), // we need to constrain the comparison function arguments instead of just using // "id". -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12 && __has_feature(objc_kindof) +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11 && __has_feature(objc_kindof) typedef __kindof NSView* KindOfView; #else typedef id KindOfView;