Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2019-12-12 06:48:22 +0000
committerAlexander Kurtakov2019-12-12 06:48:34 +0000
commit281587f6144dae46faf3a821addc01478b578917 (patch)
treebf578f8fe106ea468dc5b33a569f8b774afa87ad
parent920d001ddc2209cbd82e7b43ad3168928517089a (diff)
downloadeclipse.platform.swt-281587f6144dae46faf3a821addc01478b578917.tar.gz
eclipse.platform.swt-281587f6144dae46faf3a821addc01478b578917.tar.xz
eclipse.platform.swt-281587f6144dae46faf3a821addc01478b578917.zip
Bug 553678: Update GTK min version to 3.14
Remove Glib version check that is no longer supported due to Gtk version bump. Remove some comments that are no longer relevant. Change-Id: I99d88d85ae7610f61541293bf28d69f64097d4e7 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java2
3 files changed, 6 insertions, 13 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
index 8f4fdfe734..55b22cc276 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
@@ -673,11 +673,6 @@ public class OS extends C {
* Minimum Glib version requirement of gtk can be found in gtk's 'configure.ac' file, see line 'm4_define([glib_required_version],[2.*.*]).
*
* For reference:
- * Gtk3.4 has min version of glib 2.32
- * Gtk3.6 has min version of glib 2.33.1
- * Gtk3.8 has min version of glib 2.35.3
- * Gtk3.10 has min version of glib 2.37.5
- * Gtk3.12 has min version of glib 2.39.5
* Gtk3.14 has min version of glib 2.41.2
* Gtk3.16 has min version of glib 2.43.4
* Gtk3.18 has min version of glib 2.45.8
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
index cb0b3285a4..7d32b7d38c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
@@ -1751,13 +1751,11 @@ int getCaretBlinkTime () {
}
long getClosure (int id) {
- if (OS.GLIB_VERSION >= OS.VERSION(2, 36, 0) && ++closuresCount [id] >= 255) {
- if (closures [id] != 0) OS.g_closure_unref (closures [id]);
- closures [id] = OS.g_cclosure_new (closuresProc [id], id, 0);
- OS.g_closure_ref (closures [id]);
- OS.g_closure_sink (closures [id]);
- closuresCount [id] = 0;
- }
+ if (closures [id] != 0) OS.g_closure_unref (closures [id]);
+ closures [id] = OS.g_cclosure_new (closuresProc [id], id, 0);
+ OS.g_closure_ref (closures [id]);
+ OS.g_closure_sink (closures [id]);
+ closuresCount [id] = 0;
return closures [id];
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java
index d152bbfe1b..1ba12ae76d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java
@@ -54,7 +54,7 @@ public class Tracker extends Widget {
Rectangle bounds;
int cursorOrientation = SWT.NONE;
int oldX, oldY;
- long provider; // Gtk3.14
+ long provider;
// Re-use/cache some items for performance reasons as draw-events must be efficient to prevent jitter.
Rectangle cachedCombinedDisplayResolution = Display.getDefault().getBounds(); // Cached for performance reasons.

Back to the top