aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2012-01-20 03:36:55 (EST)
committerSilenio Quarti2012-01-20 12:44:48 (EST)
commita07db21f2dc02d806d74ab0e60154800444f5429 (patch)
tree405b886d0389112c555ef3dc1d54c06af69f691c
parent31a2a5aea4f752c906cf60c42ebcdb6129816aeb (diff)
downloadeclipse.platform.swt-a07db21f2dc02d806d74ab0e60154800444f5429.zip
eclipse.platform.swt-a07db21f2dc02d806d74ab0e60154800444f5429.tar.gz
eclipse.platform.swt-a07db21f2dc02d806d74ab0e60154800444f5429.tar.bz2
Get rid of gdk_free_text_list.
The function is deprecated (removed in GTK 3) and it's not used anywhere in the SWT codebase.
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java10
4 files changed, 2 insertions, 24 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 2dd60ad..b7aca3f 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
@@ -5650,16 +5650,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1flush)
}
#endif
-#ifndef NO__1gdk_1free_1text_1list
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1free_1text_1list)
- (JNIEnv *env, jclass that, jintLong arg0)
-{
- OS_NATIVE_ENTER(env, that, _1gdk_1free_1text_1list_FUNC);
- gdk_free_text_list((gchar **)arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1free_1text_1list_FUNC);
-}
-#endif
-
#ifndef NO__1gdk_1gc_1get_1values
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1get_1values)
(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
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 e9e9d4c..e3e9a7d 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
@@ -18,8 +18,8 @@
#ifdef NATIVE_STATS
-int OS_nativeFunctionCount = 1381;
-int OS_nativeFunctionCallCount[1381];
+int OS_nativeFunctionCount = 1380;
+int OS_nativeFunctionCallCount[1380];
char * OS_nativeFunctionNames[] = {
#ifndef JNI64
"Call__IIII",
@@ -474,7 +474,6 @@ char * OS_nativeFunctionNames[] = {
"_1gdk_1event_1peek",
"_1gdk_1event_1put",
"_1gdk_1flush",
- "_1gdk_1free_1text_1list",
"_1gdk_1gc_1get_1values",
"_1gdk_1gc_1new",
"_1gdk_1gc_1set_1background",
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 293480a..494ac90 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
@@ -482,7 +482,6 @@ typedef enum {
_1gdk_1event_1peek_FUNC,
_1gdk_1event_1put_FUNC,
_1gdk_1flush_FUNC,
- _1gdk_1free_1text_1list_FUNC,
_1gdk_1gc_1get_1values_FUNC,
_1gdk_1gc_1new_FUNC,
_1gdk_1gc_1set_1background_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 b2acc6d..c43f396 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
@@ -4231,16 +4231,6 @@ public static final void gdk_flush() {
lock.unlock();
}
}
-/** @param list cast=(gchar **) */
-public static final native void _gdk_free_text_list(int /*long*/ list);
-public static final void gdk_free_text_list(int /*long*/ list) {
- lock.lock();
- try {
- _gdk_free_text_list(list);
- } finally {
- lock.unlock();
- }
-}
/**
* @param gc cast=(GdkGC *)
* @param values cast=(GdkGCValues *),flags=no_in