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

Avoid warnings about incompatible pointers with Xcode 7

Browse Source 
Use __kindof NSView instead of id when __kindof is supported to avoid warnings
about casting between incompatible point types.
This commit is contained in:
Vadim Zeitlin
2016-03-20 19:26:14 +01:00
parent 5300caf385
commit bc4798c7df
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2109,6 +2109,14 @@ 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
// constrain the comparison function arguments instead of just using "id".
#if __has_feature(objc_kindof)
typedef __kindof NSView* KindOfView;
#else
typedef id KindOfView;
#endif
class CocoaWindowCompareContext class CocoaWindowCompareContext
{ {
wxDECLARE_NO_COPY_CLASS(CocoaWindowCompareContext); wxDECLARE_NO_COPY_CLASS(CocoaWindowCompareContext);
@@ -2132,7 +2140,8 @@ public:
{ return m_subviews; } { return m_subviews; }
/* Helper function that returns the comparison based off of the original ordering */ /* Helper function that returns the comparison based off of the original ordering */
NSComparisonResult CompareUsingOriginalOrdering(id first, id second) NSComparisonResult CompareUsingOriginalOrdering(KindOfView first,
KindOfView second)
{ {
NSUInteger firstI = [m_subviews indexOfObjectIdenticalTo:first]; NSUInteger firstI = [m_subviews indexOfObjectIdenticalTo:first];
NSUInteger secondI = [m_subviews indexOfObjectIdenticalTo:second]; NSUInteger secondI = [m_subviews indexOfObjectIdenticalTo:second];
@@ -2163,7 +2172,7 @@ private:
* the target view is always higher than every other view. When comparing two views neither of * the target view is always higher than every other view. When comparing two views neither of
* which is the target, it returns the correct response based on the original ordering * which is the target, it returns the correct response based on the original ordering
*/ */
static NSComparisonResult CocoaRaiseWindowCompareFunction(id first, id second, void *ctx) static NSComparisonResult CocoaRaiseWindowCompareFunction(KindOfView first, KindOfView second, void *ctx)
{ {
CocoaWindowCompareContext *compareContext = (CocoaWindowCompareContext*)ctx; CocoaWindowCompareContext *compareContext = (CocoaWindowCompareContext*)ctx;
// first should be ordered higher // first should be ordered higher
@@ -2191,7 +2200,7 @@ void wxWidgetCocoaImpl::Raise()
* the target view is always lower than every other view. When comparing two views neither of * the target view is always lower than every other view. When comparing two views neither of
* which is the target, it returns the correct response based on the original ordering * which is the target, it returns the correct response based on the original ordering
*/ */
static NSComparisonResult CocoaLowerWindowCompareFunction(id first, id second, void *ctx) static NSComparisonResult CocoaLowerWindowCompareFunction(KindOfView first, KindOfView second, void *ctx)
{ {
CocoaWindowCompareContext *compareContext = (CocoaWindowCompareContext*)ctx; CocoaWindowCompareContext *compareContext = (CocoaWindowCompareContext*)ctx;
// first should be ordered lower // first should be ordered lower