Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikita Nemkin2019-04-04 14:24:35 +0000
committerNikita Nemkin2019-05-17 11:30:03 +0000
commitd9e0e6eefdc3147775d0ff2f742216c49c86c98b (patch)
tree4ba4bd11babdeb5dc8ac4d0906c690208379f0fd /bundles/org.eclipse.swt/Eclipse SWT Accessibility
parent921c87a1d289df2674e164e2b2a85c054d366aa6 (diff)
downloadeclipse.platform.swt-d9e0e6eefdc3147775d0ff2f742216c49c86c98b.tar.gz
eclipse.platform.swt-d9e0e6eefdc3147775d0ff2f742216c49c86c98b.tar.xz
eclipse.platform.swt-d9e0e6eefdc3147775d0ff2f742216c49c86c98b.zip
Bug 547191 - [Cocoa] Remove support code for macOS 10.9 and earlier
* Remove code blocks guarded by OS.VERSION/OS.VERSION_MMB < 10.10. * Retire OS.VERSION and rename OS.VERSION_MMB to OS.VERSION. This also fixes gestaltSystemVersion warning on startup. Change-Id: I02614dc5c72c70ae0d0d7c57f23ec2cafd3d0cce Signed-off-by: Nikita Nemkin <nikita@nemkin.ru>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Accessibility')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java
index 7197c0aecf..9be3649131 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java
@@ -1268,8 +1268,8 @@ public class Accessible {
if (attribute.isEqualToString(OS.NSAccessibilityHeaderAttribute)) return getHeaderAttribute(childID);
if (attribute.isEqualToString(OS.NSAccessibilityIndexAttribute)) return getIndexAttribute(childID);
if (attribute.isEqualToString(OS.NSAccessibilitySelectedAttribute)) return getSelectedAttribute(childID);
- if (OS.VERSION >= 0x1060 && attribute.isEqualToString(OS.NSAccessibilityRowIndexRangeAttribute)) return getRowIndexRangeAttribute(childID);
- if (OS.VERSION >= 0x1060 && attribute.isEqualToString(OS.NSAccessibilityColumnIndexRangeAttribute)) return getColumnIndexRangeAttribute(childID);
+ if (attribute.isEqualToString(OS.NSAccessibilityRowIndexRangeAttribute)) return getRowIndexRangeAttribute(childID);
+ if (attribute.isEqualToString(OS.NSAccessibilityColumnIndexRangeAttribute)) return getColumnIndexRangeAttribute(childID);
// If this object don't know how to get the value it's up to the control itself to return an attribute value.
return null;
@@ -1296,7 +1296,7 @@ public class Accessible {
if (attribute.isEqualToString(OS.NSAccessibilityRangeForPositionParameterizedAttribute)) return getRangeForPositionParameterizedAttribute(parameter, childID);
if (attribute.isEqualToString(OS.NSAccessibilityAttributedStringForRangeParameterizedAttribute)) return getAttributedStringForRangeParameterizedAttribute(parameter, childID);
if (attribute.isEqualToString(OS.NSAccessibilityStyleRangeForIndexParameterizedAttribute)) return getStyleRangeForIndexAttribute(parameter, childID);
- if (OS.VERSION >= 0x1060 && attribute.isEqualToString(OS.NSAccessibilityCellForColumnAndRowParameterizedAttribute)) return getCellForColumnAndRowParameter(parameter, childID);
+ if (attribute.isEqualToString(OS.NSAccessibilityCellForColumnAndRowParameterizedAttribute)) return getCellForColumnAndRowParameter(parameter, childID);
return null;
}
@@ -1460,7 +1460,7 @@ public class Accessible {
returnValue.addObject(OS.NSAccessibilityStyleRangeForIndexParameterizedAttribute);
break;
case ACC.ROLE_TABLE:
- if (OS.VERSION >= 0x1060) returnValue.addObject(OS.NSAccessibilityCellForColumnAndRowParameterizedAttribute);
+ returnValue.addObject(OS.NSAccessibilityCellForColumnAndRowParameterizedAttribute);
break;
}

Back to the top