BUTTON: Fix bug that close Dialog(wizard) when pressed ESC key

The ESC key was processed at wrong listener.

Change-Id: I060b81b33ced5c45ae1e001cb83b398a1921f898
Signed-off-by: HyunJong Park <paulhj.park@samsung.com>

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TizenButton.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TizenButton.java
index dcd7b6b..b0c04e7 100644 (file)
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TizenButton.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TizenButton.java
@@ -147,6 +147,9 @@ public class TizenButton extends Canvas {
                 case SWT.TRAVERSE_TAB_NEXT:
                     e.doit = true;
                     break;
+                case SWT.TRAVERSE_ESCAPE:
+                    e.doit = true;
+                    break;
                 }
             }
         });
@@ -175,10 +178,6 @@ public class TizenButton extends Canvas {
                 case SWT.CR:
                     fireEventWhenEnterKeyPressed();
                     break;
-                case SWT.ESC:
-//                    Display.getCurrent().g
-//                    Display.getCurrent().getActiveShell().dispose();
-                    break;
                 }
             }
         });

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TizenPushButtonRenderer.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TizenPushButtonRenderer.java
index 025e785..e7e701b 100644 (file)
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TizenPushButtonRenderer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TizenPushButtonRenderer.java
@@ -274,9 +274,6 @@ public class TizenPushButtonRenderer extends TizenAbstractButtonRenderer {
                     return;
                 }
                 switch (event.character) {
-                case SWT.ESC:
-                    // Display.getCurrent().getActiveShell().dispose();
-                    break;
                 case SWT.CR:
                     /*
                      * Filter the key event of focus state