summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorJoachim Mairboeck2012-11-06 13:13:05 (EST)
committer Paul Webster2012-11-06 13:13:05 (EST)
commit7f20fdb1be1922ca600237b18c6ab39484fd2552 (patch)
treee6171014e6a535f8cc9b1fb663323574a5e88cd1
parent4cac48946e0db189dd49bb049092a179085caa8b (diff)
downloadeclipse.platform.ui-7f20fdb1be1922ca600237b18c6ab39484fd2552.zip
eclipse.platform.ui-7f20fdb1be1922ca600237b18c6ab39484fd2552.tar.gz
eclipse.platform.ui-7f20fdb1be1922ca600237b18c6ab39484fd2552.tar.bz2
Bug 357786 - [KeyBindings] Delete Key is not working in editor
make exception for CCombo
-rw-r--r--bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.e4.ui.bindings/pom.xml2
-rw-r--r--bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/KeyBindingDispatcher.java4
3 files changed, 5 insertions, 3 deletions
diff --git a/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF
index 6d8f9ab..9a1f9f6 100644
--- a/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.e4.ui.bindings;singleton:=true
-Bundle-Version: 0.10.1.qualifier
+Bundle-Version: 0.10.2.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.ui.bindings/pom.xml b/bundles/org.eclipse.e4.ui.bindings/pom.xml
index 3ac0cfd..f006032 100644
--- a/bundles/org.eclipse.e4.ui.bindings/pom.xml
+++ b/bundles/org.eclipse.e4.ui.bindings/pom.xml
@@ -21,6 +21,6 @@
</parent>
<groupId>eclipse.platform.ui</groupId>
<artifactId>org.eclipse.e4.ui.bindings</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.10.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/KeyBindingDispatcher.java b/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/KeyBindingDispatcher.java
index fd09328..c5b0401 100644
--- a/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/KeyBindingDispatcher.java
+++ b/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/KeyBindingDispatcher.java
@@ -34,6 +34,7 @@ import org.eclipse.jface.bindings.keys.ParseException;
import org.eclipse.jface.bindings.keys.SWTKeySupport;
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Display;
@@ -324,7 +325,8 @@ public class KeyBindingDispatcher {
Widget widget = event.widget;
if ((event.character == SWT.DEL)
&& ((event.stateMask & SWT.MODIFIER_MASK) == 0)
- && ((widget instanceof Text) || (widget instanceof Combo) || (widget instanceof Browser))) {
+ && ((widget instanceof Text) || (widget instanceof Combo)
+ || (widget instanceof Browser) || (widget instanceof CCombo))) {
/*
* KLUDGE. Bug 54654. The text widget relies on no listener doing any work before
* dispatching the native delete event. This does not work, as we are restricted to