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

Get rid of pre-Leopard (10.5) compatibility code in wxOSX

Browse Source 
Just use NSComparisonResult directly, we don't care about anything < 10.7.
This commit is contained in:
Vadim Zeitlin
2016-03-20 19:17:08 +01:00
parent cd57de43dd
commit e4c6385824
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2109,21 +2109,6 @@ bool wxWidgetCocoaImpl::ShowWithEffect(bool show,
return ShowViewOrWindowWithEffect(m_wxPeer, show, effect, timeout); return ShowViewOrWindowWithEffect(m_wxPeer, show, effect, timeout);
} }
/* note that the drawing order between siblings is not defined under 10.4 */
/* only starting from 10.5 the subview order is respected */
/* NSComparisonResult is typedef'd as an enum pre-Leopard but typedef'd as
* NSInteger post-Leopard. Pre-Leopard the Cocoa toolkit expects a function
* returning int and not NSComparisonResult. Post-Leopard the Cocoa toolkit
* expects a function returning the new non-enum NSComparsionResult.
* Hence we create a typedef named CocoaWindowCompareFunctionResult.
*/
#if defined(NSINTEGER_DEFINED)
typedef NSComparisonResult CocoaWindowCompareFunctionResult;
#else
typedef int CocoaWindowCompareFunctionResult;
#endif
class CocoaWindowCompareContext class CocoaWindowCompareContext
{ {
wxDECLARE_NO_COPY_CLASS(CocoaWindowCompareContext); wxDECLARE_NO_COPY_CLASS(CocoaWindowCompareContext);
@@ -2147,7 +2132,7 @@ 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 */
CocoaWindowCompareFunctionResult CompareUsingOriginalOrdering(id first, id second) NSComparisonResult CompareUsingOriginalOrdering(id first, id 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];
@@ -2178,7 +2163,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 CocoaWindowCompareFunctionResult CocoaRaiseWindowCompareFunction(id first, id second, void *ctx) static NSComparisonResult CocoaRaiseWindowCompareFunction(id first, id second, void *ctx)
{ {
CocoaWindowCompareContext *compareContext = (CocoaWindowCompareContext*)ctx; CocoaWindowCompareContext *compareContext = (CocoaWindowCompareContext*)ctx;
// first should be ordered higher // first should be ordered higher
@@ -2207,7 +2192,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 CocoaWindowCompareFunctionResult CocoaLowerWindowCompareFunction(id first, id second, void *ctx) static NSComparisonResult CocoaLowerWindowCompareFunction(id first, id second, void *ctx)
{ {
CocoaWindowCompareContext *compareContext = (CocoaWindowCompareContext*)ctx; CocoaWindowCompareContext *compareContext = (CocoaWindowCompareContext*)ctx;
// first should be ordered lower // first should be ordered lower