diff options
| author | Silenio Quarti <silenio> | 2010-01-18 16:00:30 +0000 |
|---|---|---|
| committer | Silenio Quarti <silenio> | 2010-01-18 16:00:30 +0000 |
| commit | d70097b3723123dbd8abcf6b34b2f106be849ad8 (patch) | |
| tree | 00870f0b37308561dc5412a9683274fd3943a36d /bundles/org.eclipse.swt | |
| parent | 5242997f2f7c136c61d8fbddcbd361228ca71624 (diff) | |
| download | eclipse.platform.swt-d70097b3723123dbd8abcf6b34b2f106be849ad8.tar.gz eclipse.platform.swt-d70097b3723123dbd8abcf6b34b2f106be849ad8.tar.xz eclipse.platform.swt-d70097b3723123dbd8abcf6b34b2f106be849ad8.zip | |
Bug 292893 - Shell default button may be disposed, causing IllegalArgumentException
Diffstat (limited to 'bundles/org.eclipse.swt')
5 files changed, 5 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Decorations.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Decorations.java index 809037a78b..3ba9d31120 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Decorations.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Decorations.java @@ -225,6 +225,7 @@ void fixDecorations (Decorations newDecorations, Control control, Menu [] menus) */ public Button getDefaultButton () { checkWidget(); + if (defaultButton != null && defaultButton.isDisposed ()) return null; return defaultButton; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Decorations.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Decorations.java index b172a134d1..cc90dca2a0 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Decorations.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Decorations.java @@ -224,6 +224,7 @@ void fixDecorations (Decorations newDecorations, Control control, Menu [] menus) */ public Button getDefaultButton () { checkWidget(); + if (defaultButton != null && defaultButton.isDisposed ()) return null; return defaultButton; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Decorations.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Decorations.java index f327f05505..0129737f55 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Decorations.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Decorations.java @@ -203,6 +203,7 @@ Control computeTabRoot () { */ public Button getDefaultButton () { checkWidget(); + if (defaultButton != null && defaultButton.isDisposed ()) return null; return defaultButton; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java index 60dd07dc25..fa48bb2d33 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java @@ -558,6 +558,7 @@ public Rectangle getClientArea () { */ public Button getDefaultButton () { checkWidget (); + if (defaultButton != null && defaultButton.isDisposed ()) return null; return defaultButton; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Decorations.java b/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Decorations.java index beea4160c5..8f002bff6a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Decorations.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Decorations.java @@ -330,6 +330,7 @@ void fixDecorations (Decorations newDecorations, Control control, Menu [] menus) */ public Button getDefaultButton () { checkWidget (); + if (defaultButton != null && defaultButton.isDisposed ()) return null; return defaultButton; } |