aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2012-03-06 11:13:32 (EST)
committerSilenio Quarti2012-03-09 17:23:01 (EST)
commit4c663d635aec54a09b499d1d5f75818086111360 (patch)
tree6e6c75743564c154bf46fe9a7fa9cbcb93bd0199
parent1c16a64584c10811be25bc2b538d561bcb86b0e1 (diff)
downloadeclipse.platform.swt-4c663d635aec54a09b499d1d5f75818086111360.zip
eclipse.platform.swt-4c663d635aec54a09b499d1d5f75818086111360.tar.gz
eclipse.platform.swt-4c663d635aec54a09b499d1d5f75818086111360.tar.bz2
Remove unneeded gtk version checks in Shell.
All code checking for gtk 2.4 is removed as this version is a prerequisite now.
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java13
1 files changed, 3 insertions, 10 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 9f5985d..c6a1119 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
@@ -659,9 +659,7 @@ void createHandle (int index) {
if (!isUndecorated ()) {
OS.gtk_window_set_type_hint (shellHandle, OS.GDK_WINDOW_TYPE_HINT_DIALOG);
} else {
- if (OS.GTK_VERSION >= OS.VERSION (2, 2, 0)) {
- OS.gtk_window_set_skip_taskbar_hint (shellHandle, true);
- }
+ OS.gtk_window_set_skip_taskbar_hint (shellHandle, true);
}
}
/*
@@ -2124,7 +2122,7 @@ void showWidget () {
* no focusIn events are generated on the window until the window loses
* and gain focus.
*/
- if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0) && OS.gtk_window_is_active (shellHandle)) {
+ if (OS.gtk_window_is_active (shellHandle)) {
display.activeShell = this;
display.activePending = true;
}
@@ -2265,9 +2263,6 @@ void updateModal () {
OS.gtk_window_group_remove_window (modalGroup, shellHandle);
}
}
- if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {
- fixModal (group, modalGroup);
- }
modalGroup = group;
}
@@ -2477,9 +2472,7 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
* The call is to be avoided on GTK versions newer than 2.12.0
* where it's deprecated.
*/
- if (OS.GTK_VERSION >= OS.VERSION (2, 2, 1)) {
- OS.gtk_tooltips_force_window (tooltipsHandle);
- }
+ OS.gtk_tooltips_force_window (tooltipsHandle);
int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (tooltipsHandle);
if (tipWindow != 0 && tipWindow != tooltipWindow) {
OS.g_signal_connect (tipWindow, OS.size_allocate, display.sizeAllocateProc, shellHandle);