From aed653335f141d359bc14de35b98337e6d81e48f Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Tue, 11 Sep 2018 12:15:40 +0300 Subject: Bug 530841 - [GTK2] Remove GTK 2.x support Remove no longer used cairo binding and remove no longer needed version guards. Change-Id: I72b7c1841a8e830b4419ae5d73a4cb843145e11d Signed-off-by: Alexander Kurtakov --- bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c | 12 ------------ .../Eclipse SWT PI/cairo/library/cairo_stats.c | 1 - .../Eclipse SWT PI/cairo/library/cairo_stats.h | 1 - .../cairo/org/eclipse/swt/internal/cairo/Cairo.java | 2 +- .../Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java | 4 +--- 5 files changed, 2 insertions(+), 18 deletions(-) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c index 9733cccad0..0c0888fbe5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c @@ -1455,18 +1455,6 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1version) } #endif -#ifndef NO_cairo_1version_1string -JNIEXPORT jintLong JNICALL Cairo_NATIVE(cairo_1version_1string) - (JNIEnv *env, jclass that) -{ - jintLong rc = 0; - Cairo_NATIVE_ENTER(env, that, cairo_1version_1string_FUNC); - rc = (jintLong)cairo_version_string(); - Cairo_NATIVE_EXIT(env, that, cairo_1version_1string_FUNC); - return rc; -} -#endif - #if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c index 4153701dea..bcd6c7574d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c @@ -144,7 +144,6 @@ char * Cairo_nativeFunctionNames[] = { "cairo_1path_1data_1t_1sizeof", "cairo_1path_1t_1sizeof", "cairo_1version", - "cairo_1version_1string", #ifndef JNI64 "memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II", #else diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h index 1eae730340..dab0e476d9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h @@ -154,7 +154,6 @@ typedef enum { cairo_1path_1data_1t_1sizeof_FUNC, cairo_1path_1t_1sizeof_FUNC, cairo_1version_FUNC, - cairo_1version_1string_FUNC, #ifndef JNI64 memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II_FUNC, #else diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java index 2af4e020fa..90e5e11c7a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java @@ -1224,7 +1224,7 @@ public static final void cairo_user_to_device_distance(long /*int*/ cr, double[] } } public static final native int cairo_version(); -public static final native long /*int*/ cairo_version_string(); + /** * @param dpy cast=(Display *) * @param drawable cast=(Drawable) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java index 5928159f44..47c79fad57 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java @@ -3801,9 +3801,7 @@ public void setTransform(Transform transform) { @Deprecated public void setXORMode(boolean xor) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); - if (Cairo.cairo_version() >= Cairo.CAIRO_VERSION_ENCODE(1, 10, 0)) { - Cairo.cairo_set_operator(handle, xor ? Cairo.CAIRO_OPERATOR_DIFFERENCE : Cairo.CAIRO_OPERATOR_OVER); - } + Cairo.cairo_set_operator(handle, xor ? Cairo.CAIRO_OPERATOR_DIFFERENCE : Cairo.CAIRO_OPERATOR_OVER); data.xorMode = xor; } /** -- cgit v1.2.3