activate_default

2 files changed, 12 insertions, 6 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
index 171f3b832b..b832120d74 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
@@ -233,6 +233,8 @@ Point computeNativeSize (int h, int wHint, int hHint, boolean changed) {
 	return new Point (width, height);	
 }
 
+boolean enterActivatesDefault() { return false; }
+
 /**
  * Returns the accessible object for the receiver.
  * If this is the first time this object is requested,
@@ -1534,12 +1536,14 @@ Decorations menuShell () {
 }
 
 int processKeyDown (int callData, int arg1, int int2) {
-	int keyval = OS.gdk_event_key_get_keyval (callData);
-	int [] state = new int [1];
-	OS.gdk_event_get_state (callData, state);
-	int shellHandle = _getShell ().topHandle ();
-	if (keyval==OS.GDK_Return && (state[0]&(OS.GDK_SHIFT_MASK|OS.GDK_CONTROL_MASK))==0)
-		if (OS.gtk_window_activate_default(shellHandle)) return 0;
+	if (enterActivatesDefault()) {
+		int keyval = OS.gdk_event_key_get_keyval (callData);
+			int [] state = new int [1];
+		OS.gdk_event_get_state (callData, state);
+		int shellHandle = _getShell ().topHandle ();
+		if (keyval==OS.GDK_Return && (state[0]&(OS.GDK_SHIFT_MASK|OS.GDK_CONTROL_MASK))==0)
+			if (OS.gtk_window_activate_default(shellHandle)) return 0;
+	}
 	sendKeyEvent (SWT.KeyDown, callData);
 	return 0;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
index d0430ab450..352f7a494f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
@@ -274,6 +274,8 @@ public void cut () {
 	OS.gtk_editable_cut_clipboard(handle);
 }
 
+boolean enterActivatesDefault() { return (style & SWT.SINGLE) != 0; }
+
 /**
  * Gets the line number of the caret.
  * <p>