diff options
| author | Alexander Kurtakov | 2013-02-15 19:28:55 +0000 |
|---|---|---|
| committer | Carolyn MacLeod | 2013-04-09 14:53:13 +0000 |
| commit | 3ecc2ff504c7a623924b5c261a256d476d0b2520 (patch) | |
| tree | 8f4e5c9d6ee70707c0b09d1d265c4427d2ce7d58 | |
| parent | 90927c0854548cf3e7e41578c07f87c47eae0397 (diff) | |
| download | eclipse.platform.swt-3ecc2ff504c7a623924b5c261a256d476d0b2520.tar.gz eclipse.platform.swt-3ecc2ff504c7a623924b5c261a256d476d0b2520.tar.xz eclipse.platform.swt-3ecc2ff504c7a623924b5c261a256d476d0b2520.zip | |
Remove gdk_threads_init/enter.
These two functions are not used anywhere and they are deprecated in GDK
3.6.
4 files changed, 2 insertions, 28 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 09b3e700dc..e96c1426d7 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 @@ -21006,26 +21006,6 @@ JNIEXPORT void JNICALL OS_NATIVE(g_1value_1unset) } #endif -#ifndef NO_gdk_1threads_1enter -JNIEXPORT void JNICALL OS_NATIVE(gdk_1threads_1enter) - (JNIEnv *env, jclass that) -{ - OS_NATIVE_ENTER(env, that, gdk_1threads_1enter_FUNC); - gdk_threads_enter(); - OS_NATIVE_EXIT(env, that, gdk_1threads_1enter_FUNC); -} -#endif - -#ifndef NO_gdk_1threads_1init -JNIEXPORT void JNICALL OS_NATIVE(gdk_1threads_1init) - (JNIEnv *env, jclass that) -{ - OS_NATIVE_ENTER(env, that, gdk_1threads_1init_FUNC); - gdk_threads_init(); - OS_NATIVE_EXIT(env, that, gdk_1threads_1init_FUNC); -} -#endif - #ifndef NO_gdk_1threads_1leave JNIEXPORT void JNICALL OS_NATIVE(gdk_1threads_1leave) (JNIEnv *env, jclass that) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c index 6633acb96b..4226bc99ef 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2013 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -1557,8 +1557,6 @@ char * OS_nativeFunctionNames[] = { "g_1value_1set_1int", "g_1value_1set_1int64", "g_1value_1unset", - "gdk_1threads_1enter", - "gdk_1threads_1init", "gdk_1threads_1leave", "gdk_1threads_1set_1lock_1functions", "imContextLast", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h index d58537b454..91c52e6fdd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2013 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -1567,8 +1567,6 @@ typedef enum { g_1value_1set_1int_FUNC, g_1value_1set_1int64_FUNC, g_1value_1unset_FUNC, - gdk_1threads_1enter_FUNC, - gdk_1threads_1init_FUNC, gdk_1threads_1leave_FUNC, gdk_1threads_1set_1lock_1functions_FUNC, imContextLast_FUNC, 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 07053131eb..f9e7110150 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 @@ -5257,8 +5257,6 @@ public static final int gdk_text_property_to_utf8_list_for_display (long /*int* lock.unlock(); } } -public static final native void gdk_threads_init (); -public static final native void gdk_threads_enter (); public static final native void gdk_threads_leave (); /** * @method flags=dynamic |
