diff options
| author | Steve Northover | 2006-07-28 14:31:11 +0000 |
|---|---|---|
| committer | Steve Northover | 2006-07-28 14:31:11 +0000 |
| commit | 1f027c5c8af193c62e9715a08dbeb77f33cf6d19 (patch) | |
| tree | 7211504a7b52d6c1c71df49ec9e5b4ff960bce9b | |
| parent | 22b1ab2c9d99ec0ea06157c9ecc0cfb075f026fe (diff) | |
| download | eclipse.platform.swt-1f027c5c8af193c62e9715a08dbeb77f33cf6d19.tar.gz eclipse.platform.swt-1f027c5c8af193c62e9715a08dbeb77f33cf6d19.tar.xz eclipse.platform.swt-1f027c5c8af193c62e9715a08dbeb77f33cf6d19.zip | |
149970 - multiple widgets report focus
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java index 84c085272a..05733c3ee5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java @@ -1527,7 +1527,10 @@ boolean isFocusAncestor (Control control) { */ public boolean isFocusControl () { checkWidget(); - if (this == display.focusControl) return true; + Control focusControl = display.focusControl; + if (focusControl != null && !focusControl.isDisposed ()) { + return this == focusControl; + } return hasFocus (); } |