aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatoly Spektor2013-07-19 09:55:06 (EDT)
committerArun Thondapu2013-07-22 03:27:25 (EDT)
commit7460be01cd1d48f9eb991a9b41d5cdea86e3edaa (patch)
tree6e34ab113194bdb5a6f3577d78fe4c3577129089
parent3badf881a37b9808e3b829dac9255767efd7162c (diff)
downloadeclipse.platform.swt-7460be01cd1d48f9eb991a9b41d5cdea86e3edaa.zip
eclipse.platform.swt-7460be01cd1d48f9eb991a9b41d5cdea86e3edaa.tar.gz
eclipse.platform.swt-7460be01cd1d48f9eb991a9b41d5cdea86e3edaa.tar.bz2
Bug 413316 -Remove code less than 2.6 and unused guard from Shell widget
Signed-off-by: Anatoly Spektor <aspektor@redhat.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java5
1 files changed, 1 insertions, 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 cbccf62..c4c25fd 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