summaryrefslogtreecommitdiffstats
path: root/bundles
diff options
context:
space:
mode:
authorKevin Barnes <krbarnes>2007-05-23 18:31:30 +0000
committerKevin Barnes <krbarnes>2007-05-23 18:31:30 +0000
commit8a021d89105adb15defec05f4bb294256be0d2ff (patch)
treef95347ccd5d5b30d0cea23e88b45b70dfd7321c1 /bundles
parentaa2b979f45c5e2480914ab00ce560d0a67ce4efb (diff)
downloadeclipse.platform.swt-8a021d89105adb15defec05f4bb294256be0d2ff.tar.gz
eclipse.platform.swt-8a021d89105adb15defec05f4bb294256be0d2ff.tar.xz
eclipse.platform.swt-8a021d89105adb15defec05f4bb294256be0d2ff.zip
188567 - TreeEditor closes CCombo after 500ms
Diffstat (limited to 'bundles')
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java1
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java2
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java2
3 files changed, 3 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java
index aa8a4beb9e..5547282b35 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java
@@ -1255,6 +1255,7 @@ public void setEnabled (boolean enabled) {
}
public boolean setFocus () {
checkWidget();
+ if (isFocusControl ()) return true;
return text.setFocus ();
}
public void setFont (Font font) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java
index 3303347c5f..48c8fd5c5b 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java
@@ -76,7 +76,7 @@ public class TableEditor extends ControlEditor {
int column = -1;
ControlListener columnListener;
Runnable timer;
- static final int TIMEOUT = 500;
+ static final int TIMEOUT = 1500;
/**
* Creates a TableEditor for the specified Table.
*
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java
index 3fc0db0b35..91c410724a 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java
@@ -75,7 +75,7 @@ public class TreeEditor extends ControlEditor {
ControlListener columnListener;
TreeListener treeListener;
Runnable timer;
- static final int TIMEOUT = 500;
+ static final int TIMEOUT = 1500;
/**
* Creates a TreeEditor for the specified Tree.