Bug 159465: Accessibilities: Improve traverse order for SWT ToolBar

1 files changed, 8 insertions, 12 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java
index b0976166cc..e3f42ec4e0 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java
@@ -570,7 +570,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
 	return new Point (width, height);
 }
 
-Control computeTabGroup () {
+Widget computeTabGroup () {
 	if (isTabGroup ()) return this;
 	return parent.computeTabGroup ();
 }
@@ -590,13 +590,13 @@ Control computeTabRoot () {
 	return parent.computeTabRoot ();
 }
 
-Control [] computeTabList () {
+Widget [] computeTabList () {
 	if (isTabGroup ()) {
 		if (getVisible () && getEnabled ()) {
-			return new Control [] {this};
+			return new Widget [] {this};
 		}
 	}
-	return new Control [0];
+	return new Widget [0];
 }
 
 void createHandle () {
@@ -3274,10 +3274,6 @@ public void setSize (Point size) {
 	setSize (size.x, size.y);
 }
 
-boolean setTabGroupFocus () {
-	return setTabItemFocus ();
-}
-
 boolean setTabItemFocus () {
 	if (!isShowing ()) return false;
 	return forceFocus ();
@@ -3700,8 +3696,8 @@ boolean traverseEscape () {
 
 boolean traverseGroup (boolean next) {
 	Control root = computeTabRoot ();
-	Control group = computeTabGroup ();
-	Control [] list = root.computeTabList ();
+	Widget group = computeTabGroup ();
+	Widget [] list = root.computeTabList ();
 	int length = list.length;
 	int index = 0;
 	while (index < length) {
@@ -3717,8 +3713,8 @@ boolean traverseGroup (boolean next) {
 	if (index == length) return false;
 	int start = index, offset = (next) ? 1 : -1;
 	while ((index = ((index + offset + length) % length)) != start) {
-		Control control = list [index];
-		if (!control.isDisposed () && control.setTabGroupFocus ()) {
+		Widget widget = list [index];
+		if (!widget.isDisposed () && widget.setTabGroupFocus ()) {
 			return true;
 		}
 	}