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

Avoid compilation warnings under OS X 10.11

Browse Source 
Warnings about incompatible pointer are generated
with 10.11 SDK so function arguments should be
constrained also for this SDK version.
This commit is contained in:
Artur Wieczorek
2019-10-02 20:37:46 +02:00
parent 3f42c0cbf1
commit c7643cefe0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2843,11 +2843,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 macOS 10.12 SDK (and // 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.12), // 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 // we need to constrain the comparison function arguments instead of just using
// "id". // "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; typedef __kindof NSView* KindOfView;
#else #else
typedef id KindOfView; typedef id KindOfView;