Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Northover2006-07-28 14:30:24 +0000
committerSteve Northover2006-07-28 14:30:24 +0000
commit84914bb19924face5891701482fa72fcea154c46 (patch)
tree3638afda507f84971879a7ecb6a4aa7bfa4de3ca /bundles
parentc6a55e682932cf2d9c5de5959d835ce856901679 (diff)
downloadeclipse.platform.swt-84914bb19924face5891701482fa72fcea154c46.tar.gz
eclipse.platform.swt-84914bb19924face5891701482fa72fcea154c46.tar.xz
eclipse.platform.swt-84914bb19924face5891701482fa72fcea154c46.zip
149870 - multiple widgets report focus
Diffstat (limited to 'bundles')
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java5
1 files changed, 4 insertions, 1 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 749bac385a..bc78d0b50e 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
@@ -1334,7 +1334,10 @@ public boolean isEnabled () {
*/
public boolean isFocusControl () {
checkWidget ();
- if (this == display.focusControl) return true;
+ Control focusControl = display.focusControl;
+ if (focusControl != null && !focusControl.isDisposed ()) {
+ return this == focusControl;
+ }
return hasFocus ();
}

Back to the top