aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2013-03-21 09:56:33 (EDT)
committerCarolyn MacLeod2013-04-09 10:56:47 (EDT)
commit3c7f2e403fb54ff1168c489a9c2c406b324d6e6c (patch)
tree35be4d82cb6be42dc6b203d449a54cac3ebb7459
parenta4fc531b0667e7b6786e5326be58e0f36719b5bb (diff)
downloadeclipse.platform.swt-3c7f2e403fb54ff1168c489a9c2c406b324d6e6c.zip
eclipse.platform.swt-3c7f2e403fb54ff1168c489a9c2c406b324d6e6c.tar.gz
eclipse.platform.swt-3c7f2e403fb54ff1168c489a9c2c406b324d6e6c.tar.bz2
Bug 398176 - [GTK3] Terminate button in Console view is always enabled
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java
index 460af14..ad21ebb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java
@@ -930,8 +930,10 @@ public void setEnabled (boolean enabled) {
* whether the pointer is currently in the button is never updated.
* As a result, when it is re-enabled it automatically enters
* a PRELIGHT state. The fix is to set a NORMAL state.
+ *
+ * Note that on GTK 3 this code causes the item to be re-enabled.
*/
- if (OS.GTK_VERSION >= OS.VERSION (2, 14, 0)) {
+ if (OS.GTK_VERSION >= OS.VERSION (2, 14, 0) && !OS.GTK3) {
OS.gtk_widget_set_state (topHandle, OS.GTK_STATE_NORMAL);
}
}