Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxOSX view comparison callback signature for older SDKs

Browse Source 
Take NSView* in the callback used by [NSView sortSubviewsUsingFunction:context:]
only when using 10.12 SDK, but not when using earlier ones, as the callback
was still taking just "id" in them.
This commit is contained in:
Vadim Zeitlin
2017-05-01 00:10:12 +02:00
committed by Vadim Zeitlin
parent e851db7e9e
commit a5bcf1dafd
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osx/cocoa/window.mm
View File

@@ -2129,9 +2129,11 @@ bool wxWidgetCocoaImpl::ShowWithEffect(bool show,
return ShowViewOrWindowWithEffect(m_wxPeer, show, effect, timeout); return ShowViewOrWindowWithEffect(m_wxPeer, show, effect, timeout);
} }
// To avoid warnings about incompatible pointer types with Xcode 7, we need to // To avoid warnings about incompatible pointer types with macOS 10.12 SDK (and
// constrain the comparison function arguments instead of just using "id". // maybe even earlier? This has changed at some time between 10.9 and 10.12),
#if __has_feature(objc_kindof) // 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)
typedef __kindof NSView* KindOfView; typedef __kindof NSView* KindOfView;
#else #else
typedef id KindOfView; typedef id KindOfView;