Bug 328290 - Need some way to intercept 'fixfocus'

1 files changed, 9 insertions, 7 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 2c66f602b9..93fcdde884 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
@@ -949,8 +949,15 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De
 void fixFocus (Control focusControl) {
 	Shell shell = getShell ();
 	Control control = this;
-	while (control != shell && (control = control.parent) != null) {
-		if (control.setFixedFocus ()) return;
+	Display display = this.display;
+	boolean oldFixFocus = display.fixFocus;
+	display.fixFocus = true;
+	try {
+		while (control != shell && (control = control.parent) != null) {
+				if (control.setFocus ()) return;
+		}
+	} finally {
+		display.fixFocus = oldFixFocus;
 	}
 	shell.setSavedFocus (focusControl);
 	OS.SetFocus (0);
@@ -2978,11 +2985,6 @@ public void setEnabled (boolean enabled) {
 	if (fixFocus) fixFocus (control);
 }
 
-boolean setFixedFocus () {
-	if ((style & SWT.NO_FOCUS) != 0) return false;
-	return forceFocus ();
-}
-
 /**
  * Causes the receiver to have the <em>keyboard focus</em>, 
  * such that all keyboard events will be delivered to it.  Focus