Bug 471329: [GTK] Flipped button order and default button

Change-Id: If242c4b59f8e53ca058b0fdedfd51c4352ec3aac

2 files changed, 22 insertions, 11 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java
index bf73f49cdf..328c55d5a1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java
@@ -523,16 +523,6 @@ boolean restoreFocus () {
 	if (savedFocus != null && savedFocus.isDisposed ()) savedFocus = null;
 	boolean restored = savedFocus != null && savedFocus.setFocus ();
 	savedFocus = null;
-	/*
-	* This code is intentionally commented.  When no widget
-	* has been given focus, some platforms give focus to the
-	* default button.  
-	*/
-//	if (restored) return true;
-//	if (defaultButton != null && !defaultButton.isDisposed ()) {
-//		if (defaultButton.setFocus ()) return true;
-//	}
-//	return false;
 	return restored;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
index 49ae036a04..cf8ef849cd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
@@ -1640,7 +1640,28 @@ public void open () {
 		Shell.class.cast(getParent()).open();
 	setVisible (true);
 	if (isDisposed ()) return;
-	if (!restoreFocus () && !traverseGroup (true)) setFocus ();
+	/*
+	 * When no widget has been given focus, or another push button has focus,
+	 * give focus to the default button. This avoids overriding the default
+	 * button.
+	 */
+	boolean restored = restoreFocus ();
+	if (!restored) {
+		restored = traverseGroup (true);
+	}
+	if (restored) {
+		Control focusControl = display.getFocusControl ();
+		if (focusControl instanceof Button && (focusControl.style & SWT.PUSH) != 0) {
+			restored = false;
+		}
+	}
+	if (!restored) {
+		if (defaultButton != null && !defaultButton.isDisposed ()) {
+			defaultButton.setFocus ();
+		} else {
+			setFocus ();
+		}
+	}
 }
 
 @Override