Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2013-09-13 06:04:05 -0400
committerAlexander Kurtakov2013-09-13 06:04:05 -0400
commit16a2d99c4a0024885d5ddc5cc660afb5f8b55f19 (patch)
treef57d92481d98bd8f6607a43ceac7cfb8a42e0d97
parentc78c3cef9acce1b21defb80eca7e44a208cde824 (diff)
downloadeclipse.platform.swt-16a2d99c4a0024885d5ddc5cc660afb5f8b55f19.tar.gz
eclipse.platform.swt-16a2d99c4a0024885d5ddc5cc660afb5f8b55f19.tar.xz
eclipse.platform.swt-16a2d99c4a0024885d5ddc5cc660afb5f8b55f19.zip
gtk/atk: Drop unused bindings.
Removed bindings for atk functions that are not used. Started in order to remove unused and deprecated atk_focus_tracker_notify function which is deprecated in ATK 2.9.4. Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c98
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java87
4 files changed, 3 insertions, 202 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c
index 9cf516f757..801f30ba68 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.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
@@ -309,16 +309,6 @@ JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1VALUE_1GET_1IFACE)
}
#endif
-#ifndef NO__1atk_1focus_1tracker_1notify
-JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1focus_1tracker_1notify)
- (JNIEnv *env, jclass that, jintLong arg0)
-{
- ATK_NATIVE_ENTER(env, that, _1atk_1focus_1tracker_1notify_FUNC);
- atk_focus_tracker_notify((AtkObject *)arg0);
- ATK_NATIVE_EXIT(env, that, _1atk_1focus_1tracker_1notify_FUNC);
-}
-#endif
-
#ifndef NO__1atk_1get_1default_1registry
JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1get_1default_1registry)
(JNIEnv *env, jclass that)
@@ -331,18 +321,6 @@ JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1get_1default_1registry)
}
#endif
-#ifndef NO__1atk_1object_1factory_1create_1accessible
-JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1object_1factory_1create_1accessible)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
- jintLong rc = 0;
- ATK_NATIVE_ENTER(env, that, _1atk_1object_1factory_1create_1accessible_FUNC);
- rc = (jintLong)atk_object_factory_create_accessible((AtkObjectFactory *)arg0, (GObject *)arg1);
- ATK_NATIVE_EXIT(env, that, _1atk_1object_1factory_1create_1accessible_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO__1atk_1object_1factory_1get_1accessible_1type
JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1object_1factory_1get_1accessible_1type)
(JNIEnv *env, jclass that, jintLong arg0)
@@ -375,18 +353,6 @@ JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1object_1notify_1state_1change)
}
#endif
-#ifndef NO__1atk_1object_1ref_1relation_1set
-JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1object_1ref_1relation_1set)
- (JNIEnv *env, jclass that, jintLong arg0)
-{
- jintLong rc = 0;
- ATK_NATIVE_ENTER(env, that, _1atk_1object_1ref_1relation_1set_FUNC);
- rc = (jintLong)atk_object_ref_relation_set((AtkObject *)arg0);
- ATK_NATIVE_EXIT(env, that, _1atk_1object_1ref_1relation_1set_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO__1atk_1registry_1get_1factory
JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1registry_1get_1factory)
(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
@@ -409,40 +375,6 @@ JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1registry_1set_1factory_1type)
}
#endif
-#ifndef NO__1atk_1relation_1set_1get_1n_1relations
-JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1relation_1set_1get_1n_1relations)
- (JNIEnv *env, jclass that, jintLong arg0)
-{
- jint rc = 0;
- ATK_NATIVE_ENTER(env, that, _1atk_1relation_1set_1get_1n_1relations_FUNC);
- rc = (jint)atk_relation_set_get_n_relations((AtkRelationSet *)arg0);
- ATK_NATIVE_EXIT(env, that, _1atk_1relation_1set_1get_1n_1relations_FUNC);
- return rc;
-}
-#endif
-
-#ifndef NO__1atk_1relation_1set_1get_1relation
-JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1relation_1set_1get_1relation)
- (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
- jintLong rc = 0;
- ATK_NATIVE_ENTER(env, that, _1atk_1relation_1set_1get_1relation_FUNC);
- rc = (jintLong)atk_relation_set_get_relation((AtkRelationSet *)arg0, arg1);
- ATK_NATIVE_EXIT(env, that, _1atk_1relation_1set_1get_1relation_FUNC);
- return rc;
-}
-#endif
-
-#ifndef NO__1atk_1relation_1set_1remove
-JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1relation_1set_1remove)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
- ATK_NATIVE_ENTER(env, that, _1atk_1relation_1set_1remove_FUNC);
- atk_relation_set_remove((AtkRelationSet *)arg0, (AtkRelation *)arg1);
- ATK_NATIVE_EXIT(env, that, _1atk_1relation_1set_1remove_FUNC);
-}
-#endif
-
#ifndef NO__1atk_1role_1register
JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1role_1register)
(JNIEnv *env, jclass that, jbyteArray arg0)
@@ -471,18 +403,6 @@ JNIEXPORT jboolean JNICALL ATK_NATIVE(_1atk_1state_1set_1add_1state)
}
#endif
-#ifndef NO__1atk_1state_1set_1new
-JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1state_1set_1new)
- (JNIEnv *env, jclass that)
-{
- jintLong rc = 0;
- ATK_NATIVE_ENTER(env, that, _1atk_1state_1set_1new_FUNC);
- rc = (jintLong)atk_state_set_new();
- ATK_NATIVE_EXIT(env, that, _1atk_1state_1set_1new_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO__1atk_1text_1attribute_1get_1name
JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1text_1attribute_1get_1name)
(JNIEnv *env, jclass that, jint arg0)
@@ -507,22 +427,6 @@ JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1text_1attribute_1get_1value)
}
#endif
-#ifndef NO__1atk_1text_1attribute_1register
-JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1text_1attribute_1register)
- (JNIEnv *env, jclass that, jbyteArray arg0)
-{
- jbyte *lparg0=NULL;
- jint rc = 0;
- ATK_NATIVE_ENTER(env, that, _1atk_1text_1attribute_1register_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)atk_text_attribute_register((const gchar *)lparg0);
-fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- ATK_NATIVE_EXIT(env, that, _1atk_1text_1attribute_1register_FUNC);
- return rc;
-}
-#endif
-
#if (!defined(NO__1call__II) && !defined(JNI64)) || (!defined(NO__1call__JJ) && defined(JNI64))
#ifndef JNI64
JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c
index 7c818b47c6..37db362ce4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_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
@@ -43,24 +43,16 @@ char * ATK_nativeFunctionNames[] = {
"_1ATK_1TABLE_1GET_1IFACE",
"_1ATK_1TEXT_1GET_1IFACE",
"_1ATK_1VALUE_1GET_1IFACE",
- "_1atk_1focus_1tracker_1notify",
"_1atk_1get_1default_1registry",
- "_1atk_1object_1factory_1create_1accessible",
"_1atk_1object_1factory_1get_1accessible_1type",
"_1atk_1object_1initialize",
"_1atk_1object_1notify_1state_1change",
- "_1atk_1object_1ref_1relation_1set",
"_1atk_1registry_1get_1factory",
"_1atk_1registry_1set_1factory_1type",
- "_1atk_1relation_1set_1get_1n_1relations",
- "_1atk_1relation_1set_1get_1relation",
- "_1atk_1relation_1set_1remove",
"_1atk_1role_1register",
"_1atk_1state_1set_1add_1state",
- "_1atk_1state_1set_1new",
"_1atk_1text_1attribute_1get_1name",
"_1atk_1text_1attribute_1get_1value",
- "_1atk_1text_1attribute_1register",
#ifndef JNI64
"_1call__II",
#else
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h
index 8ef65c4620..c283d2f863 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_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
@@ -53,24 +53,16 @@ typedef enum {
_1ATK_1TABLE_1GET_1IFACE_FUNC,
_1ATK_1TEXT_1GET_1IFACE_FUNC,
_1ATK_1VALUE_1GET_1IFACE_FUNC,
- _1atk_1focus_1tracker_1notify_FUNC,
_1atk_1get_1default_1registry_FUNC,
- _1atk_1object_1factory_1create_1accessible_FUNC,
_1atk_1object_1factory_1get_1accessible_1type_FUNC,
_1atk_1object_1initialize_FUNC,
_1atk_1object_1notify_1state_1change_FUNC,
- _1atk_1object_1ref_1relation_1set_FUNC,
_1atk_1registry_1get_1factory_FUNC,
_1atk_1registry_1set_1factory_1type_FUNC,
- _1atk_1relation_1set_1get_1n_1relations_FUNC,
- _1atk_1relation_1set_1get_1relation_FUNC,
- _1atk_1relation_1set_1remove_FUNC,
_1atk_1role_1register_FUNC,
_1atk_1state_1set_1add_1state_FUNC,
- _1atk_1state_1set_1new_FUNC,
_1atk_1text_1attribute_1get_1name_FUNC,
_1atk_1text_1attribute_1get_1value_FUNC,
- _1atk_1text_1attribute_1register_FUNC,
#ifndef JNI64
_1call__II_FUNC,
#else
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java
index 7140eb09f4..8d263ac682 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java
@@ -289,16 +289,6 @@ public static final long /*int*/ ATK_VALUE_GET_IFACE (long /*int*/ handle) {
lock.unlock();
}
}
-/** @param object cast=(AtkObject *) */
-public static final native void _atk_focus_tracker_notify (long /*int*/ object);
-public static final void atk_focus_tracker_notify (long /*int*/ object) {
- lock.lock();
- try {
- _atk_focus_tracker_notify(object);
- } finally {
- lock.unlock();
- }
-}
public static final native long /*int*/ _atk_get_default_registry ();
public static final long /*int*/ atk_get_default_registry () {
lock.lock();
@@ -308,19 +298,6 @@ public static final long /*int*/ atk_get_default_registry () {
lock.unlock();
}
}
-/**
- * @param factory cast=(AtkObjectFactory *)
- * @param obj cast=(GObject *)
- */
-public static final native long /*int*/ _atk_object_factory_create_accessible (long /*int*/ factory, long /*int*/ obj);
-public static final long /*int*/ atk_object_factory_create_accessible (long /*int*/ factory, long /*int*/ obj) {
- lock.lock();
- try {
- return _atk_object_factory_create_accessible(factory, obj);
- } finally {
- lock.unlock();
- }
-}
/** @param factory cast=(AtkObjectFactory *) */
public static final native long /*int*/ _atk_object_factory_get_accessible_type (long /*int*/ factory);
public static final long /*int*/ atk_object_factory_get_accessible_type (long /*int*/ factory) {
@@ -354,16 +331,6 @@ public static final void atk_object_notify_state_change (long /*int*/ accessible
lock.unlock();
}
}
-/** @param accessible cast=(AtkObject *) */
-public static final native long /*int*/ _atk_object_ref_relation_set (long /*int*/ accessible);
-public static final long /*int*/ atk_object_ref_relation_set (long /*int*/ accessible) {
- lock.lock();
- try {
- return _atk_object_ref_relation_set(accessible);
- } finally {
- lock.unlock();
- }
-}
/**
* @param name cast=(const gchar *)
*/
@@ -377,18 +344,6 @@ public static final int atk_role_register (byte[] name) {
}
}
/**
- * @param name cast=(const gchar *)
- */
-public static final native int _atk_text_attribute_register (byte[] name);
-public static final int atk_text_attribute_register (byte[] name) {
- lock.lock();
- try {
- return _atk_text_attribute_register(name);
- } finally {
- lock.unlock();
- }
-}
-/**
* @param registry cast=(AtkRegistry *)
* @param type cast=(GType)
*/
@@ -415,39 +370,6 @@ public static final void atk_registry_set_factory_type (long /*int*/ registry, l
lock.unlock();
}
}
-/** @param set cast=(AtkRelationSet *) */
-public static final native int _atk_relation_set_get_n_relations (long /*int*/ set);
-public static final int atk_relation_set_get_n_relations (long /*int*/ set) {
- lock.lock();
- try {
- return _atk_relation_set_get_n_relations(set);
- } finally {
- lock.unlock();
- }
-}
-/** @param set cast=(AtkRelationSet *) */
-public static final native long /*int*/ _atk_relation_set_get_relation (long /*int*/ set, int i);
-public static final long /*int*/ atk_relation_set_get_relation (long /*int*/ set, int i) {
- lock.lock();
- try {
- return _atk_relation_set_get_relation (set, i);
- } finally {
- lock.unlock();
- }
-}
-/**
- * @param set cast=(AtkRelationSet *)
- * @param relation cast=(AtkRelation *)
- */
-public static final native void _atk_relation_set_remove (long /*int*/ set, long /*int*/ relation);
-public static final void atk_relation_set_remove (long /*int*/ set, long /*int*/ relation) {
- lock.lock();
- try {
- _atk_relation_set_remove (set, relation);
- } finally {
- lock.unlock();
- }
-}
/**
* @param set cast=(AtkStateSet *)
* @param type cast=(AtkStateType)
@@ -461,15 +383,6 @@ public static final boolean atk_state_set_add_state (long /*int*/ set, int type)
lock.unlock();
}
}
-public static final native long /*int*/ _atk_state_set_new ();
-public static final long /*int*/ atk_state_set_new () {
- lock.lock();
- try {
- return _atk_state_set_new();
- } finally {
- lock.unlock();
- }
-}
public static final native long /*int*/ _atk_text_attribute_get_name (int attr);
public static final long /*int*/ atk_text_attribute_get_name (int attr) {
lock.lock();

Back to the top