Bug 530841: [GTK2] Remove GTK 2.x support

gdk_rgba* functions doesn't have to be dynamic anymore.

Change-Id: I53f3b8ad9c1b5070aebba8939f7b7538d8a7369c
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

2 files changed, 0 insertions, 41 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
index e2268420f0..f1bd830a65 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
@@ -2031,15 +2031,7 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1rgba_1free)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	GDK_NATIVE_ENTER(env, that, _1gdk_1rgba_1free_FUNC);
-/*
 	gdk_rgba_free((GdkRGBA *)arg0);
-*/
-	{
-		GDK_LOAD_FUNCTION(fp, gdk_rgba_free)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GdkRGBA *))fp)((GdkRGBA *)arg0);
-		}
-	}
 	GDK_NATIVE_EXIT(env, that, _1gdk_1rgba_1free_FUNC);
 }
 #endif
@@ -2052,15 +2044,7 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1rgba_1hash)
 	jint rc = 0;
 	GDK_NATIVE_ENTER(env, that, _1gdk_1rgba_1hash_FUNC);
 	if (arg0) if ((lparg0 = getGdkRGBAFields(env, arg0, &_arg0)) == NULL) goto fail;
-/*
 	rc = (jint)gdk_rgba_hash((GdkRGBA *)lparg0);
-*/
-	{
-		GDK_LOAD_FUNCTION(fp, gdk_rgba_hash)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(GdkRGBA *))fp)((GdkRGBA *)lparg0);
-		}
-	}
 fail:
 	if (arg0 && lparg0) setGdkRGBAFields(env, arg0, lparg0);
 	GDK_NATIVE_EXIT(env, that, _1gdk_1rgba_1hash_FUNC);
@@ -2078,15 +2062,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1rgba_1parse)
 	GDK_NATIVE_ENTER(env, that, _1gdk_1rgba_1parse_FUNC);
 	if (arg0) if ((lparg0 = getGdkRGBAFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-/*
 	rc = (jintLong)gdk_rgba_parse((GdkRGBA *)lparg0, (const gchar *)lparg1);
-*/
-	{
-		GDK_LOAD_FUNCTION(fp, gdk_rgba_parse)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkRGBA *, const gchar *))fp)((GdkRGBA *)lparg0, (const gchar *)lparg1);
-		}
-	}
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) setGdkRGBAFields(env, arg0, lparg0);
@@ -2103,15 +2079,7 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1rgba_1to_1string)
 	jintLong rc = 0;
 	GDK_NATIVE_ENTER(env, that, _1gdk_1rgba_1to_1string_FUNC);
 	if (arg0) if ((lparg0 = getGdkRGBAFields(env, arg0, &_arg0)) == NULL) goto fail;
-/*
 	rc = (jintLong)gdk_rgba_to_string((GdkRGBA *)lparg0);
-*/
-	{
-		GDK_LOAD_FUNCTION(fp, gdk_rgba_to_string)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkRGBA *))fp)((GdkRGBA *)lparg0);
-		}
-	}
 fail:
 	if (arg0 && lparg0) setGdkRGBAFields(env, arg0, lparg0);
 	GDK_NATIVE_EXIT(env, that, _1gdk_1rgba_1to_1string_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java
index a5abade138..cb54af4368 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java
@@ -297,7 +297,6 @@ public class GDK extends OS {
 	public static final native long /*int*/ _GDK_TYPE_RGBA();
 	public static final long /*int*/ GDK_TYPE_RGBA() {
 		lock.lock();
-		assert GTK.GTK3 : "GTK3 code was run by GTK2";
 		try {
 			return _GDK_TYPE_RGBA();
 		} finally {
@@ -1719,13 +1718,11 @@ public class GDK extends OS {
 		}
 	}
 	/**
-	 * @method flags=dynamic
 	 * @param rgba cast=(GdkRGBA *)
 	 */
 	public static final native long /*int*/ _gdk_rgba_to_string(GdkRGBA rgba);
 	public static final long /*int*/ gdk_rgba_to_string(GdkRGBA rgba) {
 		lock.lock();
-		assert GTK.GTK3 : "GTK3 code was run by GTK2";
 		try {
 			return _gdk_rgba_to_string(rgba);
 		} finally {
@@ -1733,13 +1730,11 @@ public class GDK extends OS {
 		}
 	}
 	/**
-	 * @method flags=dynamic
 	 * @param rgba cast=(GdkRGBA *)
 	 */
 	public static final native void _gdk_rgba_free(long /*int*/ rgba);
 	public static final void gdk_rgba_free(long /*int*/ rgba) {
 		lock.lock();
-		assert GTK.GTK3 : "GTK3 code was run by GTK2";
 		try {
 			_gdk_rgba_free(rgba);
 		} finally {
@@ -1747,13 +1742,11 @@ public class GDK extends OS {
 		}
 	}
 	/**
-	 * @method flags=dynamic
 	 * @param rgba cast=(GdkRGBA *)
 	 */
 	public static final native int _gdk_rgba_hash(GdkRGBA rgba);
 	public static final int gdk_rgba_hash(GdkRGBA  rgba) {
 		lock.lock();
-		assert GTK.GTK3 : "GTK3 code was run by GTK2";
 		try {
 			return _gdk_rgba_hash(rgba);
 		} finally {
@@ -1761,14 +1754,12 @@ public class GDK extends OS {
 		}
 	}
 	/**
-	 * @method flags=dynamic
 	 * @param rgba cast=(GdkRGBA *)
 	 * @param property cast=(const gchar *)
 	 */
 	public static final native long /*int*/ _gdk_rgba_parse(GdkRGBA rgba, byte[] property);
 	public static final long /*int*/ gdk_rgba_parse(GdkRGBA rgba, byte[] property) {
 		lock.lock();
-		assert GTK.GTK3 : "GTK3 code was run by GTK2";
 		try {
 			return _gdk_rgba_parse(rgba, property);
 		} finally {