diff options
| author | Scott Kovatch <skovatch> | 2010-09-27 22:14:07 +0000 |
|---|---|---|
| committer | Scott Kovatch <skovatch> | 2010-09-27 22:14:07 +0000 |
| commit | 0c7ea34e26bc471bc3ebe779ed4a9465247e3219 (patch) | |
| tree | 24997e14d48f99d14a2074f297c0ee6bee667217 | |
| parent | be954920b3bf51c2767d57c5bc9db3ba96994f28 (diff) | |
| download | eclipse.platform.swt-0c7ea34e26bc471bc3ebe779ed4a9465247e3219.tar.gz eclipse.platform.swt-0c7ea34e26bc471bc3ebe779ed4a9465247e3219.tar.xz eclipse.platform.swt-0c7ea34e26bc471bc3ebe779ed4a9465247e3219.zip | |
326200 - check state of tool item before setting the underlying NSButton's enabled state.
| -rwxr-xr-x | bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java | 2 | ||||
| -rwxr-xr-x | bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java index 752c76b86c..11cb3f28d6 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java @@ -248,7 +248,7 @@ void enableWidget(boolean enabled) { for (int i = 0; i < itemCount; i++) { ToolItem item = items[i]; if (item != null) { - item.enableWidget(enabled); + item.enableWidget(enabled && item.getEnabled()); } } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java index 16e49a1d04..762412fa7d 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java @@ -846,7 +846,7 @@ public void setEnabled (boolean enabled) { } else { state |= DISABLED; } - enableWidget(enabled); + enableWidget(enabled && parent.isEnabled()); } /** |