aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatoly Spektor2012-07-11 14:36:08 (EDT)
committerSilenio Quarti2012-08-01 13:57:38 (EDT)
commitf1673e5c2c5db30d58829f2b5e01e44a00b773f5 (patch)
tree6617d94d91fb04b829cb4a2d862e16739b079552
parent481acb697d7ad58259b5d7499b52ef20ae98feaf (diff)
downloadeclipse.platform.swt-f1673e5c2c5db30d58829f2b5e01e44a00b773f5.zip
eclipse.platform.swt-f1673e5c2c5db30d58829f2b5e01e44a00b773f5.tar.gz
eclipse.platform.swt-f1673e5c2c5db30d58829f2b5e01e44a00b773f5.tar.bz2
remove unused function GTK_WIDGET_STATE
Conflicts: bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c12
-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.java9
4 files changed, 2 insertions, 25 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 218ebcc..155d1a0 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
@@ -1683,18 +1683,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1GTK_1WIDGET_1SET_1FLAGS)
}
#endif
-#ifndef NO__1GTK_1WIDGET_1STATE
-JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1WIDGET_1STATE)
- (JNIEnv *env, jclass that, jintLong arg0)
-{
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1STATE_FUNC);
- rc = (jint)GTK_WIDGET_STATE(arg0);
- OS_NATIVE_EXIT(env, that, _1GTK_1WIDGET_1STATE_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO__1GTK_1WIDGET_1UNSET_1FLAGS
JNIEXPORT void JNICALL OS_NATIVE(_1GTK_1WIDGET_1UNSET_1FLAGS)
(JNIEnv *env, jclass that, jintLong arg0, jint 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 54cce7e..4468de2 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 = 1321;
-int OS_nativeFunctionCallCount[1321];
+int OS_nativeFunctionCount = 1320;
+int OS_nativeFunctionCallCount[1320];
char * OS_nativeFunctionNames[] = {
#ifndef JNI64
"Call__IIII",
@@ -167,7 +167,6 @@ char * OS_nativeFunctionNames[] = {
"_1GTK_1WIDGET_1MAPPED",
"_1GTK_1WIDGET_1SENSITIVE",
"_1GTK_1WIDGET_1SET_1FLAGS",
- "_1GTK_1WIDGET_1STATE",
"_1GTK_1WIDGET_1UNSET_1FLAGS",
"_1GTK_1WIDGET_1VISIBLE",
"_1G_1OBJECT_1CLASS",
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 896fe5c..da5dd95 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
@@ -175,7 +175,6 @@ typedef enum {
_1GTK_1WIDGET_1MAPPED_FUNC,
_1GTK_1WIDGET_1SENSITIVE_FUNC,
_1GTK_1WIDGET_1SET_1FLAGS_FUNC,
- _1GTK_1WIDGET_1STATE_FUNC,
_1GTK_1WIDGET_1UNSET_1FLAGS_FUNC,
_1GTK_1WIDGET_1VISIBLE_FUNC,
_1G_1OBJECT_1CLASS_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 2e7f3ff..b13bdea 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
@@ -1635,15 +1635,6 @@ public static final int GTK_WIDGET_FLAGS(int /*long*/ wid) {
lock.unlock();
}
}
-public static final native int _GTK_WIDGET_STATE(int /*long*/ wid);
-public static final int GTK_WIDGET_STATE(int /*long*/ wid) {
- lock.lock();
- try {
- return _GTK_WIDGET_STATE(wid);
- } finally {
- lock.unlock();
- }
-}
public static final native boolean _GTK_WIDGET_HAS_DEFAULT(int /*long*/ wid);
public static final boolean GTK_WIDGET_HAS_DEFAULT(int /*long*/ wid) {
lock.lock();