diff options
| author | Silenio Quarti | 2002-03-01 19:06:16 +0000 |
|---|---|---|
| committer | Silenio Quarti | 2002-03-01 19:06:16 +0000 |
| commit | 1c7308ad5b835cfba817493da798b5e1ae872b12 (patch) | |
| tree | e53934de8194941562080f7f157d24458ed25344 | |
| parent | e40da280506cd32cc2ff3f6d09e9d5002b038f60 (diff) | |
| download | eclipse.platform.swt-1c7308ad5b835cfba817493da798b5e1ae872b12.tar.gz eclipse.platform.swt-1c7308ad5b835cfba817493da798b5e1ae872b12.tar.xz eclipse.platform.swt-1c7308ad5b835cfba817493da798b5e1ae872b12.zip | |
traverseEscape/traverseReturn - hierarchy
3 files changed, 18 insertions, 15 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Control.java index bb94c69958..c70b304c7a 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Control.java @@ -2297,15 +2297,12 @@ boolean translateTraversal (int key_sym, PhKeyEvent_t phEvent) { boolean all = false;
switch (key_sym) {
case OS.Pk_Escape: {
- Shell shell = getShell ();
- if (!shell.isVisible () || !shell.isEnabled ()) return false;
+ all = true;
detail = SWT.TRAVERSE_ESCAPE;
break;
}
case OS.Pk_Return: {
- Button button = menuShell ().getDefaultButton ();
- if (button == null || button.isDisposed ()) return false;
- if (!button.isVisible () || !button.isEnabled ()) return false;
+ all = true;
detail = SWT.TRAVERSE_RETURN;
break;
}
@@ -2407,11 +2404,7 @@ public boolean traverse (int traversal) { }
boolean traverseEscape () {
- Shell shell = getShell ();
- if (shell.parent == null) return false;
- if (!shell.isVisible () || !shell.isEnabled ()) return false;
- shell.close ();
- return true;
+ return false;
}
boolean traverseGroup (boolean next) {
@@ -2476,11 +2469,7 @@ boolean traverseMnemonic (char key) { }
boolean traverseReturn () {
- Button button = menuShell ().getDefaultButton ();
- if (button == null || button.isDisposed ()) return false;
- if (!button.isVisible () || !button.isEnabled ()) return false;
- button.click ();
- return true;
+ return false;
}
/** 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 5cb6eac896..597d16c349 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 @@ -502,4 +502,11 @@ public void setText (String string) { text = string;
}
+boolean traverseReturn () {
+ if (defaultButton == null || defaultButton.isDisposed ()) return false;
+ if (!defaultButton.isVisible () || !defaultButton.isEnabled ()) return false;
+ defaultButton.click ();
+ return true;
+}
+
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Shell.java index a268a375e1..52e1e1cfe1 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Shell.java @@ -910,4 +910,11 @@ int topHandle () { return shellHandle;
}
+boolean traverseEscape () {
+ if (parent == null) return false;
+ if (!isVisible () || !isEnabled ()) return false;
+ close ();
+ return true;
+}
+
}
|