From 7460be01cd1d48f9eb991a9b41d5cdea86e3edaa Mon Sep 17 00:00:00 2001 From: Anatoly Spektor Date: Fri, 19 Jul 2013 09:55:06 -0400 Subject: Bug 413316 -Remove code less than 2.6 and unused guard from Shell widget Signed-off-by: Anatoly Spektor --- .../Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 cbccf62181..c4c25fdb60 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 @@ -543,9 +543,6 @@ void bringToTop (boolean force) { */ boolean xFocus = false; if (activeShell != null) { - if (OS.GTK_VERSION < OS.VERSION (2, 6, 8)) { - xFocus = activeShell.isUndecorated (); - } display.activeShell = null; display.activePending = true; } @@ -2357,7 +2354,7 @@ void updateModal () { */ if (group == 0 && topModalShell != null) group = topModalShell.getShell ().group; } - if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0) && group == 0) { + if (group == 0) { /* * Feature in GTK. Starting with GTK version 2.10, GTK * doesn't assign windows to a default group. The fix is to -- cgit v1.2.3