diff options
author | Carolyn MacLeod <carolyn> | 2010-01-21 19:47:39 +0000 |
---|---|---|
committer | Carolyn MacLeod <carolyn> | 2010-01-21 19:47:39 +0000 |
commit | 4e3ace7441083b52059381fc7315ed0ffaa59c75 (patch) | |
tree | d81aec5c9a167881801af572c130f60ee47ddd98 /bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library | |
parent | 30eaec187a22ddf0998c34e45a71b135fb6c6509 (diff) | |
download | eclipse.platform.swt-4e3ace7441083b52059381fc7315ed0ffaa59c75.tar.gz eclipse.platform.swt-4e3ace7441083b52059381fc7315ed0ffaa59c75.tar.xz eclipse.platform.swt-4e3ace7441083b52059381fc7315ed0ffaa59c75.zip |
Initial Accessibility API update
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library')
9 files changed, 1236 insertions, 38 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 b663012f2d..ab1f3e5f07 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, 2008 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2010 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 @@ -19,6 +19,126 @@ #define ATK_NATIVE(func) Java_org_eclipse_swt_internal_accessibility_gtk_ATK_##func +#ifndef NO_ATK_1IS_1NO_1OP_1OBJECT_1FACTORY +JNIEXPORT jboolean JNICALL ATK_NATIVE(ATK_1IS_1NO_1OP_1OBJECT_1FACTORY) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jboolean rc = 0; + ATK_NATIVE_ENTER(env, that, ATK_1IS_1NO_1OP_1OBJECT_1FACTORY_FUNC); + rc = (jboolean)ATK_IS_NO_OP_OBJECT_FACTORY(arg0); + ATK_NATIVE_EXIT(env, that, ATK_1IS_1NO_1OP_1OBJECT_1FACTORY_FUNC); + return rc; +} +#endif + +#ifndef NO_ATK_1TYPE_1ACTION +JNIEXPORT jintLong JNICALL ATK_NATIVE(ATK_1TYPE_1ACTION) + (JNIEnv *env, jclass that) +{ + jintLong rc = 0; + ATK_NATIVE_ENTER(env, that, ATK_1TYPE_1ACTION_FUNC); + rc = (jintLong)ATK_TYPE_ACTION; + ATK_NATIVE_EXIT(env, that, ATK_1TYPE_1ACTION_FUNC); + return rc; +} +#endif + +#ifndef NO_ATK_1TYPE_1COMPONENT +JNIEXPORT jintLong JNICALL ATK_NATIVE(ATK_1TYPE_1COMPONENT) + (JNIEnv *env, jclass that) +{ + jintLong rc = 0; + ATK_NATIVE_ENTER(env, that, ATK_1TYPE_1COMPONENT_FUNC); + rc = (jintLong)ATK_TYPE_COMPONENT; + ATK_NATIVE_EXIT(env, that, ATK_1TYPE_1COMPONENT_FUNC); + return rc; +} +#endif + +#ifndef NO_ATK_1TYPE_1HYPERTEXT +JNIEXPORT jintLong JNICALL ATK_NATIVE(ATK_1TYPE_1HYPERTEXT) + (JNIEnv *env, jclass that) +{ + jintLong rc = 0; + ATK_NATIVE_ENTER(env, that, ATK_1TYPE_1HYPERTEXT_FUNC); + rc = (jintLong)ATK_TYPE_HYPERTEXT; + ATK_NATIVE_EXIT(env, that, ATK_1TYPE_1HYPERTEXT_FUNC); + return rc; +} +#endif + +#ifndef NO_ATK_1TYPE_1OBJECT_1FACTORY +JNIEXPORT jintLong JNICALL ATK_NATIVE(ATK_1TYPE_1OBJECT_1FACTORY) + (JNIEnv *env, jclass that) +{ + jintLong rc = 0; + ATK_NATIVE_ENTER(env, that, ATK_1TYPE_1OBJECT_1FACTORY_FUNC); + rc = (jintLong)ATK_TYPE_OBJECT_FACTORY; + ATK_NATIVE_EXIT(env, that, ATK_1TYPE_1OBJECT_1FACTORY_FUNC); + return rc; +} +#endif + +#ifndef NO_ATK_1TYPE_1SELECTION +JNIEXPORT jintLong JNICALL ATK_NATIVE(ATK_1TYPE_1SELECTION) + (JNIEnv *env, jclass that) +{ + jintLong rc = 0; + ATK_NATIVE_ENTER(env, that, ATK_1TYPE_1SELECTION_FUNC); + rc = (jintLong)ATK_TYPE_SELECTION; + ATK_NATIVE_EXIT(env, that, ATK_1TYPE_1SELECTION_FUNC); + return rc; +} +#endif + +#ifndef NO_ATK_1TYPE_1TABLE +JNIEXPORT jintLong JNICALL ATK_NATIVE(ATK_1TYPE_1TABLE) + (JNIEnv *env, jclass that) +{ + jintLong rc = 0; + ATK_NATIVE_ENTER(env, that, ATK_1TYPE_1TABLE_FUNC); + rc = (jintLong)ATK_TYPE_TABLE; + ATK_NATIVE_EXIT(env, that, ATK_1TYPE_1TABLE_FUNC); + return rc; +} +#endif + +#ifndef NO_ATK_1TYPE_1TEXT +JNIEXPORT jintLong JNICALL ATK_NATIVE(ATK_1TYPE_1TEXT) + (JNIEnv *env, jclass that) +{ + jintLong rc = 0; + ATK_NATIVE_ENTER(env, that, ATK_1TYPE_1TEXT_FUNC); + rc = (jintLong)ATK_TYPE_TEXT; + ATK_NATIVE_EXIT(env, that, ATK_1TYPE_1TEXT_FUNC); + return rc; +} +#endif + +#ifndef NO_ATK_1TYPE_1VALUE +JNIEXPORT jintLong JNICALL ATK_NATIVE(ATK_1TYPE_1VALUE) + (JNIEnv *env, jclass that) +{ + jintLong rc = 0; + ATK_NATIVE_ENTER(env, that, ATK_1TYPE_1VALUE_FUNC); + rc = (jintLong)ATK_TYPE_VALUE; + ATK_NATIVE_EXIT(env, that, ATK_1TYPE_1VALUE_FUNC); + return rc; +} +#endif + +#ifndef NO_AtkAttribute_1sizeof +JNIEXPORT jint JNICALL ATK_NATIVE(AtkAttribute_1sizeof) + (JNIEnv *env, jclass that) +{ + jint rc = 0; + ATK_NATIVE_ENTER(env, that, AtkAttribute_1sizeof_FUNC); + rc = (jint)AtkAttribute_sizeof(); + ATK_NATIVE_EXIT(env, that, AtkAttribute_1sizeof_FUNC); + return rc; +} +#endif + #ifndef NO_AtkObjectFactoryClass_1sizeof JNIEXPORT jint JNICALL ATK_NATIVE(AtkObjectFactoryClass_1sizeof) (JNIEnv *env, jclass that) @@ -43,6 +163,42 @@ JNIEXPORT jint JNICALL ATK_NATIVE(AtkObjectFactory_1sizeof) } #endif +#ifndef NO_AtkTextRange_1sizeof +JNIEXPORT jint JNICALL ATK_NATIVE(AtkTextRange_1sizeof) + (JNIEnv *env, jclass that) +{ + jint rc = 0; + ATK_NATIVE_ENTER(env, that, AtkTextRange_1sizeof_FUNC); + rc = (jint)AtkTextRange_sizeof(); + ATK_NATIVE_EXIT(env, that, AtkTextRange_1sizeof_FUNC); + return rc; +} +#endif + +#ifndef NO_AtkTextRectangle_1sizeof +JNIEXPORT jint JNICALL ATK_NATIVE(AtkTextRectangle_1sizeof) + (JNIEnv *env, jclass that) +{ + jint rc = 0; + ATK_NATIVE_ENTER(env, that, AtkTextRectangle_1sizeof_FUNC); + rc = (jint)AtkTextRectangle_sizeof(); + ATK_NATIVE_EXIT(env, that, AtkTextRectangle_1sizeof_FUNC); + return rc; +} +#endif + +#ifndef NO_GTK_1TYPE_1ACCESSIBLE +JNIEXPORT jintLong JNICALL ATK_NATIVE(GTK_1TYPE_1ACCESSIBLE) + (JNIEnv *env, jclass that) +{ + jintLong rc = 0; + ATK_NATIVE_ENTER(env, that, GTK_1TYPE_1ACCESSIBLE_FUNC); + rc = (jintLong)GTK_TYPE_ACCESSIBLE; + ATK_NATIVE_EXIT(env, that, GTK_1TYPE_1ACCESSIBLE_FUNC); + return rc; +} +#endif + #ifndef NO__1ATK_1ACTION_1GET_1IFACE JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1ACTION_1GET_1IFACE) (JNIEnv *env, jclass that, jintLong arg0) @@ -67,6 +223,18 @@ JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1COMPONENT_1GET_1IFACE) } #endif +#ifndef NO__1ATK_1HYPERTEXT_1GET_1IFACE +JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1HYPERTEXT_1GET_1IFACE) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jintLong rc = 0; + ATK_NATIVE_ENTER(env, that, _1ATK_1HYPERTEXT_1GET_1IFACE_FUNC); + rc = (jintLong)ATK_HYPERTEXT_GET_IFACE(arg0); + ATK_NATIVE_EXIT(env, that, _1ATK_1HYPERTEXT_1GET_1IFACE_FUNC); + return rc; +} +#endif + #ifndef NO__1ATK_1OBJECT_1FACTORY_1CLASS JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1OBJECT_1FACTORY_1CLASS) (JNIEnv *env, jclass that, jintLong arg0) @@ -91,6 +259,18 @@ JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1SELECTION_1GET_1IFACE) } #endif +#ifndef NO__1ATK_1TABLE_1GET_1IFACE +JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1TABLE_1GET_1IFACE) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jintLong rc = 0; + ATK_NATIVE_ENTER(env, that, _1ATK_1TABLE_1GET_1IFACE_FUNC); + rc = (jintLong)ATK_TABLE_GET_IFACE(arg0); + ATK_NATIVE_EXIT(env, that, _1ATK_1TABLE_1GET_1IFACE_FUNC); + return rc; +} +#endif + #ifndef NO__1ATK_1TEXT_1GET_1IFACE JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1TEXT_1GET_1IFACE) (JNIEnv *env, jclass that, jintLong arg0) @@ -103,6 +283,18 @@ JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1TEXT_1GET_1IFACE) } #endif +#ifndef NO__1ATK_1VALUE_1GET_1IFACE +JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1VALUE_1GET_1IFACE) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jintLong rc = 0; + ATK_NATIVE_ENTER(env, that, _1ATK_1VALUE_1GET_1IFACE_FUNC); + rc = (jintLong)ATK_VALUE_GET_IFACE(arg0); + ATK_NATIVE_EXIT(env, that, _1ATK_1VALUE_1GET_1IFACE_FUNC); + return rc; +} +#endif + #ifndef NO__1GTK_1ACCESSIBLE JNIEXPORT jintLong JNICALL ATK_NATIVE(_1GTK_1ACCESSIBLE) (JNIEnv *env, jclass that, jintLong arg0) @@ -263,6 +455,30 @@ JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1state_1set_1new) } #endif +#ifndef NO__1atk_1text_1attribute_1get_1name +JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1text_1attribute_1get_1name) + (JNIEnv *env, jclass that, jint arg0) +{ + jintLong rc = 0; + ATK_NATIVE_ENTER(env, that, _1atk_1text_1attribute_1get_1name_FUNC); + rc = (jintLong)atk_text_attribute_get_name(arg0); + ATK_NATIVE_EXIT(env, that, _1atk_1text_1attribute_1get_1name_FUNC); + return rc; +} +#endif + +#ifndef NO__1atk_1text_1attribute_1get_1value +JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1text_1attribute_1get_1value) + (JNIEnv *env, jclass that, jint arg0, jint arg1) +{ + jintLong rc = 0; + ATK_NATIVE_ENTER(env, that, _1atk_1text_1attribute_1get_1value_FUNC); + rc = (jintLong)atk_text_attribute_get_value(arg0, arg1); + ATK_NATIVE_EXIT(env, that, _1atk_1text_1attribute_1get_1value_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) @@ -401,6 +617,18 @@ JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__JJJJJJJ)(JNIEnv *env, jclass that, } #endif +#ifndef NO_g_1strdup +JNIEXPORT jintLong JNICALL ATK_NATIVE(g_1strdup) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jintLong rc = 0; + ATK_NATIVE_ENTER(env, that, g_1strdup_FUNC); + rc = (jintLong)g_strdup((char *)arg0); + ATK_NATIVE_EXIT(env, that, g_1strdup_FUNC); + return rc; +} +#endif + #if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) @@ -422,6 +650,30 @@ JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibil } #endif +#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I) && defined(JNI64)) +#ifndef JNI64 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) +#else +JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) +#endif +{ + AtkAttribute _arg1, *lparg1=NULL; +#ifndef JNI64 + ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I_FUNC); +#else + ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I_FUNC); +#endif + if (arg1) if ((lparg1 = getAtkAttributeFields(env, arg1, &_arg1)) == NULL) goto fail; + memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); +fail: +#ifndef JNI64 + ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I_FUNC); +#else + ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I_FUNC); +#endif +} +#endif + #if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) @@ -527,6 +779,27 @@ JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibil } #endif +#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2) && defined(JNI64)) +#ifndef JNI64 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) +#else +JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) +#endif +{ +#ifndef JNI64 + ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2_FUNC); +#else + ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2_FUNC); +#endif + if (arg1) getAtkTableIfaceFields(env, arg1, (AtkTableIface *)arg0); +#ifndef JNI64 + ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2_FUNC); +#else + ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2_FUNC); +#endif +} +#endif + #if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) @@ -548,6 +821,75 @@ JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibil } #endif +#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I) && defined(JNI64)) +#ifndef JNI64 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) +#else +JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) +#endif +{ + AtkTextRange _arg1, *lparg1=NULL; +#ifndef JNI64 + ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I_FUNC); +#else + ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I_FUNC); +#endif + if (arg1) if ((lparg1 = getAtkTextRangeFields(env, arg1, &_arg1)) == NULL) goto fail; + memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); +fail: +#ifndef JNI64 + ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I_FUNC); +#else + ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I_FUNC); +#endif +} +#endif + +#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I) && defined(JNI64)) +#ifndef JNI64 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) +#else +JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) +#endif +{ + AtkTextRectangle _arg1, *lparg1=NULL; +#ifndef JNI64 + ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I_FUNC); +#else + ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I_FUNC); +#endif + if (arg1) if ((lparg1 = getAtkTextRectangleFields(env, arg1, &_arg1)) == NULL) goto fail; + memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); +fail: +#ifndef JNI64 + ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I_FUNC); +#else + ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I_FUNC); +#endif +} +#endif + +#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2) && defined(JNI64)) +#ifndef JNI64 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) +#else +JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) +#endif +{ +#ifndef JNI64 + ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2_FUNC); +#else + ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2_FUNC); +#endif + if (arg1) getAtkValueIfaceFields(env, arg1, (AtkValueIface *)arg0); +#ifndef JNI64 + ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2_FUNC); +#else + ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2_FUNC); +#endif +} +#endif + #if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) @@ -569,6 +911,31 @@ JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibili } #endif +#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2JI) && defined(JNI64)) +#ifndef JNI64 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) +#else +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) +#endif +{ + AtkAttribute _arg0, *lparg0=NULL; +#ifndef JNI64 + ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2II_FUNC); +#else + ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2JI_FUNC); +#endif + if (arg0) if ((lparg0 = getAtkAttributeFields(env, arg0, &_arg0)) == NULL) goto fail; + memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); +fail: + if (arg0 && lparg0) setAtkAttributeFields(env, arg0, lparg0); +#ifndef JNI64 + ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2II_FUNC); +#else + ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2JI_FUNC); +#endif +} +#endif + #if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) @@ -674,6 +1041,27 @@ JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibili } #endif +#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2J) && defined(JNI64)) +#ifndef JNI64 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) +#else +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) +#endif +{ +#ifndef JNI64 + ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2I_FUNC); +#else + ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2J_FUNC); +#endif + if (arg0) setAtkTableIfaceFields(env, arg0, (AtkTableIface *)arg1); +#ifndef JNI64 + ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2I_FUNC); +#else + ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2J_FUNC); +#endif +} +#endif + #if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) @@ -695,6 +1083,77 @@ JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibili } #endif +#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2JI) && defined(JNI64)) +#ifndef JNI64 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) +#else +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) +#endif +{ + AtkTextRange _arg0, *lparg0=NULL; +#ifndef JNI64 + ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2II_FUNC); +#else + ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2JI_FUNC); +#endif + if (arg0) if ((lparg0 = getAtkTextRangeFields(env, arg0, &_arg0)) == NULL) goto fail; + memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); +fail: + if (arg0 && lparg0) setAtkTextRangeFields(env, arg0, lparg0); +#ifndef JNI64 + ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2II_FUNC); +#else + ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2JI_FUNC); +#endif +} +#endif + +#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2JI) && defined(JNI64)) +#ifndef JNI64 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) +#else +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) +#endif +{ + AtkTextRectangle _arg0, *lparg0=NULL; +#ifndef JNI64 + ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2II_FUNC); +#else + ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2JI_FUNC); +#endif + if (arg0) if ((lparg0 = getAtkTextRectangleFields(env, arg0, &_arg0)) == NULL) goto fail; + memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); +fail: + if (arg0 && lparg0) setAtkTextRectangleFields(env, arg0, lparg0); +#ifndef JNI64 + ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2II_FUNC); +#else + ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2JI_FUNC); +#endif +} +#endif + +#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2J) && defined(JNI64)) +#ifndef JNI64 +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) +#else +JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) +#endif +{ +#ifndef JNI64 + ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2I_FUNC); +#else + ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2J_FUNC); +#endif + if (arg0) setAtkValueIfaceFields(env, arg0, (AtkValueIface *)arg1); +#ifndef JNI64 + ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2I_FUNC); +#else + ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2J_FUNC); +#endif +} +#endif + #if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I)(JNIEnv *env, jclass that, jobject 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 0527eda396..dfce31cb91 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, 2008 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2009 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 @@ -18,16 +18,32 @@ #ifdef NATIVE_STATS -int ATK_nativeFunctionCount = 42; -int ATK_nativeFunctionCallCount[42]; +int ATK_nativeFunctionCount = 71; +int ATK_nativeFunctionCallCount[71]; char * ATK_nativeFunctionNames[] = { + "ATK_1IS_1NO_1OP_1OBJECT_1FACTORY", + "ATK_1TYPE_1ACTION", + "ATK_1TYPE_1COMPONENT", + "ATK_1TYPE_1HYPERTEXT", + "ATK_1TYPE_1OBJECT_1FACTORY", + "ATK_1TYPE_1SELECTION", + "ATK_1TYPE_1TABLE", + "ATK_1TYPE_1TEXT", + "ATK_1TYPE_1VALUE", + "AtkAttribute_1sizeof", "AtkObjectFactoryClass_1sizeof", "AtkObjectFactory_1sizeof", + "AtkTextRange_1sizeof", + "AtkTextRectangle_1sizeof", + "GTK_1TYPE_1ACCESSIBLE", "_1ATK_1ACTION_1GET_1IFACE", "_1ATK_1COMPONENT_1GET_1IFACE", + "_1ATK_1HYPERTEXT_1GET_1IFACE", "_1ATK_1OBJECT_1FACTORY_1CLASS", "_1ATK_1SELECTION_1GET_1IFACE", + "_1ATK_1TABLE_1GET_1IFACE", "_1ATK_1TEXT_1GET_1IFACE", + "_1ATK_1VALUE_1GET_1IFACE", "_1GTK_1ACCESSIBLE", "_1atk_1focus_1tracker_1notify", "_1atk_1get_1default_1registry", @@ -42,6 +58,8 @@ char * ATK_nativeFunctionNames[] = { "_1atk_1relation_1set_1remove", "_1atk_1state_1set_1add_1state", "_1atk_1state_1set_1new", + "_1atk_1text_1attribute_1get_1name", + "_1atk_1text_1attribute_1get_1value", #ifndef JNI64 "_1call__II", #else @@ -72,12 +90,18 @@ char * ATK_nativeFunctionNames[] = { #else "_1call__JJJJJJJ", #endif + "g_1strdup", #ifndef JNI64 "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2", #else "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2", #endif #ifndef JNI64 + "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I", +#else + "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I", +#endif +#ifndef JNI64 "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2", #else "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2", @@ -103,16 +127,41 @@ char * ATK_nativeFunctionNames[] = { "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2", #endif #ifndef JNI64 + "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2", +#else + "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2", +#endif +#ifndef JNI64 "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2", #else "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2", #endif #ifndef JNI64 + "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I", +#else + "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I", +#endif +#ifndef JNI64 + "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I", +#else + "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I", +#endif +#ifndef JNI64 + "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2", +#else + "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2", +#endif +#ifndef JNI64 "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I", #else "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J", #endif #ifndef JNI64 + "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2II", +#else + "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2JI", +#endif +#ifndef JNI64 "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I", #else "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J", @@ -138,11 +187,31 @@ char * ATK_nativeFunctionNames[] = { "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J", #endif #ifndef JNI64 + "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2I", +#else + "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2J", +#endif +#ifndef JNI64 "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I", #else "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J", #endif #ifndef JNI64 + "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2II", +#else + "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2JI", +#endif +#ifndef JNI64 + "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2II", +#else + "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2JI", +#endif +#ifndef JNI64 + "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2I", +#else + "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2J", +#endif +#ifndef JNI64 "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I", #else "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J", 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 d4680abfb0..5f4debeabe 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, 2008 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2009 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 @@ -29,13 +29,29 @@ extern char* ATK_nativeFunctionNames[]; #endif typedef enum { + ATK_1IS_1NO_1OP_1OBJECT_1FACTORY_FUNC, + ATK_1TYPE_1ACTION_FUNC, + ATK_1TYPE_1COMPONENT_FUNC, + ATK_1TYPE_1HYPERTEXT_FUNC, + ATK_1TYPE_1OBJECT_1FACTORY_FUNC, + ATK_1TYPE_1SELECTION_FUNC, + ATK_1TYPE_1TABLE_FUNC, + ATK_1TYPE_1TEXT_FUNC, + ATK_1TYPE_1VALUE_FUNC, + AtkAttribute_1sizeof_FUNC, AtkObjectFactoryClass_1sizeof_FUNC, AtkObjectFactory_1sizeof_FUNC, + AtkTextRange_1sizeof_FUNC, + AtkTextRectangle_1sizeof_FUNC, + GTK_1TYPE_1ACCESSIBLE_FUNC, _1ATK_1ACTION_1GET_1IFACE_FUNC, _1ATK_1COMPONENT_1GET_1IFACE_FUNC, + _1ATK_1HYPERTEXT_1GET_1IFACE_FUNC, _1ATK_1OBJECT_1FACTORY_1CLASS_FUNC, _1ATK_1SELECTION_1GET_1IFACE_FUNC, + _1ATK_1TABLE_1GET_1IFACE_FUNC, _1ATK_1TEXT_1GET_1IFACE_FUNC, + _1ATK_1VALUE_1GET_1IFACE_FUNC, _1GTK_1ACCESSIBLE_FUNC, _1atk_1focus_1tracker_1notify_FUNC, _1atk_1get_1default_1registry_FUNC, @@ -50,6 +66,8 @@ typedef enum { _1atk_1relation_1set_1remove_FUNC, _1atk_1state_1set_1add_1state_FUNC, _1atk_1state_1set_1new_FUNC, + _1atk_1text_1attribute_1get_1name_FUNC, + _1atk_1text_1attribute_1get_1value_FUNC, #ifndef JNI64 _1call__II_FUNC, #else @@ -80,12 +98,18 @@ typedef enum { #else _1call__JJJJJJJ_FUNC, #endif + g_1strdup_FUNC, #ifndef JNI64 memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC, #else memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC, #endif #ifndef JNI64 + memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I_FUNC, +#else + memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I_FUNC, +#endif +#ifndef JNI64 memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC, #else memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC, @@ -111,16 +135,41 @@ typedef enum { memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC, #endif #ifndef JNI64 + memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2_FUNC, +#else + memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2_FUNC, +#endif +#ifndef JNI64 memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC, #else memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC, #endif #ifndef JNI64 + memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I_FUNC, +#else + memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I_FUNC, +#endif +#ifndef JNI64 + memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I_FUNC, +#else + memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I_FUNC, +#endif +#ifndef JNI64 + memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2_FUNC, +#else + memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2_FUNC, +#endif +#ifndef JNI64 memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I_FUNC, #else memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J_FUNC, #endif #ifndef JNI64 + memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2II_FUNC, +#else + memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2JI_FUNC, +#endif +#ifndef JNI64 memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I_FUNC, #else memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J_FUNC, @@ -146,11 +195,31 @@ typedef enum { memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J_FUNC, #endif #ifndef JNI64 + memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2I_FUNC, +#else + memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2J_FUNC, +#endif +#ifndef JNI64 memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I_FUNC, #else memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J_FUNC, #endif #ifndef JNI64 + memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2II_FUNC, +#else + memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2JI_FUNC, +#endif +#ifndef JNI64 + memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2II_FUNC, +#else + memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2JI_FUNC, +#endif +#ifndef JNI64 + memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2I_FUNC, +#else + memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2J_FUNC, +#endif +#ifndef JNI64 memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I_FUNC, #else memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c index cd9a5ed7db..73d1d8efce 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2010 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 @@ -62,6 +62,40 @@ void setAtkActionIfaceFields(JNIEnv *env, jobject lpObject, AtkActionIface *lpSt } #endif +#ifndef NO_AtkAttribute +typedef struct AtkAttribute_FID_CACHE { + int cached; + jclass clazz; + jfieldID name, value; +} AtkAttribute_FID_CACHE; + +AtkAttribute_FID_CACHE AtkAttributeFc; + +void cacheAtkAttributeFields(JNIEnv *env, jobject lpObject) +{ + if (AtkAttributeFc.cached) return; + AtkAttributeFc.clazz = (*env)->GetObjectClass(env, lpObject); + AtkAttributeFc.name = (*env)->GetFieldID(env, AtkAttributeFc.clazz, "name", I_J); + AtkAttributeFc.value = (*env)->GetFieldID(env, AtkAttributeFc.clazz, "value", I_J); + AtkAttributeFc.cached = 1; +} + +AtkAttribute *getAtkAttributeFields(JNIEnv *env, jobject lpObject, AtkAttribute *lpStruct) +{ + if (!AtkAttributeFc.cached) cacheAtkAttributeFields(env, lpObject); + lpStruct->name = (char *)(*env)->GetIntLongField(env, lpObject, AtkAttributeFc.name); + lpStruct->value = (char *)(*env)->GetIntLongField(env, lpObject, AtkAttributeFc.value); + return lpStruct; +} + +void setAtkAttributeFields(JNIEnv *env, jobject lpObject, AtkAttribute *lpStruct) +{ + if (!AtkAttributeFc.cached) cacheAtkAttributeFields(env, lpObject); + (*env)->SetIntLongField(env, lpObject, AtkAttributeFc.name, (jintLong)lpStruct->name); + (*env)->SetIntLongField(env, lpObject, AtkAttributeFc.value, (jintLong)lpStruct->value); +} +#endif + #ifndef NO_AtkComponentIface typedef struct AtkComponentIface_FID_CACHE { int cached; @@ -352,11 +386,147 @@ void setAtkSelectionIfaceFields(JNIEnv *env, jobject lpObject, AtkSelectionIface } #endif +#ifndef NO_AtkTableIface +typedef struct AtkTableIface_FID_CACHE { + int cached; + jclass clazz; + jfieldID ref_at, get_index_at, get_column_at_index, get_row_at_index, get_n_columns, get_n_rows, get_column_extent_at, get_row_extent_at, get_caption, get_column_description, get_column_header, get_row_description, get_row_header, get_summary, set_caption, set_column_description, set_column_header, set_row_description, set_row_header, set_summary, get_selected_columns, get_selected_rows, is_column_selected, is_row_selected, is_selected, add_row_selection, remove_row_selection, add_column_selection, remove_column_selection, row_inserted, column_inserted, row_deleted, column_deleted, row_reordered, column_reordered, model_changed; +} AtkTableIface_FID_CACHE; + +AtkTableIface_FID_CACHE AtkTableIfaceFc; + +void cacheAtkTableIfaceFields(JNIEnv *env, jobject lpObject) +{ + if (AtkTableIfaceFc.cached) return; + AtkTableIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject); + AtkTableIfaceFc.ref_at = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "ref_at", I_J); + AtkTableIfaceFc.get_index_at = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_index_at", I_J); + AtkTableIfaceFc.get_column_at_index = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_column_at_index", I_J); + AtkTableIfaceFc.get_row_at_index = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_row_at_index", I_J); + AtkTableIfaceFc.get_n_columns = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_n_columns", I_J); + AtkTableIfaceFc.get_n_rows = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_n_rows", I_J); + AtkTableIfaceFc.get_column_extent_at = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_column_extent_at", I_J); + AtkTableIfaceFc.get_row_extent_at = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_row_extent_at", I_J); + AtkTableIfaceFc.get_caption = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_caption", I_J); + AtkTableIfaceFc.get_column_description = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_column_description", I_J); + AtkTableIfaceFc.get_column_header = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_column_header", I_J); + AtkTableIfaceFc.get_row_description = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_row_description", I_J); + AtkTableIfaceFc.get_row_header = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_row_header", I_J); + AtkTableIfaceFc.get_summary = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_summary", I_J); + AtkTableIfaceFc.set_caption = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "set_caption", I_J); + AtkTableIfaceFc.set_column_description = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "set_column_description", I_J); + AtkTableIfaceFc.set_column_header = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "set_column_header", I_J); + AtkTableIfaceFc.set_row_description = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "set_row_description", I_J); + AtkTableIfaceFc.set_row_header = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "set_row_header", I_J); + AtkTableIfaceFc.set_summary = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "set_summary", I_J); + AtkTableIfaceFc.get_selected_columns = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_selected_columns", I_J); + AtkTableIfaceFc.get_selected_rows = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "get_selected_rows", I_J); + AtkTableIfaceFc.is_column_selected = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "is_column_selected", I_J); + AtkTableIfaceFc.is_row_selected = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "is_row_selected", I_J); + AtkTableIfaceFc.is_selected = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "is_selected", I_J); + AtkTableIfaceFc.add_row_selection = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "add_row_selection", I_J); + AtkTableIfaceFc.remove_row_selection = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "remove_row_selection", I_J); + AtkTableIfaceFc.add_column_selection = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "add_column_selection", I_J); + AtkTableIfaceFc.remove_column_selection = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "remove_column_selection", I_J); + AtkTableIfaceFc.row_inserted = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "row_inserted", I_J); + AtkTableIfaceFc.column_inserted = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "column_inserted", I_J); + AtkTableIfaceFc.row_deleted = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "row_deleted", I_J); + AtkTableIfaceFc.column_deleted = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "column_deleted", I_J); + AtkTableIfaceFc.row_reordered = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "row_reordered", I_J); + AtkTableIfaceFc.column_reordered = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "column_reordered", I_J); + AtkTableIfaceFc.model_changed = (*env)->GetFieldID(env, AtkTableIfaceFc.clazz, "model_changed", I_J); + AtkTableIfaceFc.cached = 1; +} + +AtkTableIface *getAtkTableIfaceFields(JNIEnv *env, jobject lpObject, AtkTableIface *lpStruct) +{ + if (!AtkTableIfaceFc.cached) cacheAtkTableIfaceFields(env, lpObject); + lpStruct->ref_at = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.ref_at); + lpStruct->get_index_at = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_index_at); + lpStruct->get_column_at_index = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_at_index); + lpStruct->get_row_at_index = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_at_index); + lpStruct->get_n_columns = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_n_columns); + lpStruct->get_n_rows = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_n_rows); + lpStruct->get_column_extent_at = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_extent_at); + lpStruct->get_row_extent_at = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_extent_at); + lpStruct->get_caption = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_caption); + lpStruct->get_column_description = (G_CONST_RETURN gchar* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_description); + lpStruct->get_column_header = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_header); + lpStruct->get_row_description = (G_CONST_RETURN gchar* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_description); + lpStruct->get_row_header = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_header); + lpStruct->get_summary = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_summary); + lpStruct->set_caption = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_caption); + lpStruct->set_column_description = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_column_description); + lpStruct->set_column_header = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_column_header); + lpStruct->set_row_description = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_row_description); + lpStruct->set_row_header = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_row_header); + lpStruct->set_summary = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_summary); + lpStruct->get_selected_columns = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_selected_columns); + lpStruct->get_selected_rows = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_selected_rows); + lpStruct->is_column_selected = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.is_column_selected); + lpStruct->is_row_selected = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.is_row_selected); + lpStruct->is_selected = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.is_selected); + lpStruct->add_row_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.add_row_selection); + lpStruct->remove_row_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.remove_row_selection); + lpStruct->add_column_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.add_column_selection); + lpStruct->remove_column_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.remove_column_selection); + lpStruct->row_inserted = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.row_inserted); + lpStruct->column_inserted = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.column_inserted); + lpStruct->row_deleted = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.row_deleted); + lpStruct->column_deleted = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.column_deleted); + lpStruct->row_reordered = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.row_reordered); + lpStruct->column_reordered = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.column_reordered); + lpStruct->model_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.model_changed); + return lpStruct; +} + +void setAtkTableIfaceFields(JNIEnv *env, jobject lpObject, AtkTableIface *lpStruct) +{ + if (!AtkTableIfaceFc.cached) cacheAtkTableIfaceFields(env, lpObject); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.ref_at, (jintLong)lpStruct->ref_at); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_index_at, (jintLong)lpStruct->get_index_at); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_at_index, (jintLong)lpStruct->get_column_at_index); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_at_index, (jintLong)lpStruct->get_row_at_index); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_n_columns, (jintLong)lpStruct->get_n_columns); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_n_rows, (jintLong)lpStruct->get_n_rows); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_extent_at, (jintLong)lpStruct->get_column_extent_at); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_extent_at, (jintLong)lpStruct->get_row_extent_at); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_caption, (jintLong)lpStruct->get_caption); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_description, (jintLong)lpStruct->get_column_description); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_header, (jintLong)lpStruct->get_column_header); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_description, (jintLong)lpStruct->get_row_description); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_header, (jintLong)lpStruct->get_row_header); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_summary, (jintLong)lpStruct->get_summary); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.set_caption, (jintLong)lpStruct->set_caption); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.set_column_description, (jintLong)lpStruct->set_column_description); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.set_column_header, (jintLong)lpStruct->set_column_header); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.set_row_description, (jintLong)lpStruct->set_row_description); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.set_row_header, (jintLong)lpStruct->set_row_header); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.set_summary, (jintLong)lpStruct->set_summary); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_selected_columns, (jintLong)lpStruct->get_selected_columns); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.get_selected_rows, (jintLong)lpStruct->get_selected_rows); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.is_column_selected, (jintLong)lpStruct->is_column_selected); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.is_row_selected, (jintLong)lpStruct->is_row_selected); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.is_selected, (jintLong)lpStruct->is_selected); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.add_row_selection, (jintLong)lpStruct->add_row_selection); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.remove_row_selection, (jintLong)lpStruct->remove_row_selection); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.add_column_selection, (jintLong)lpStruct->add_column_selection); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.remove_column_selection, (jintLong)lpStruct->remove_column_selection); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.row_inserted, (jintLong)lpStruct->row_inserted); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.column_inserted, (jintLong)lpStruct->column_inserted); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.row_deleted, (jintLong)lpStruct->row_deleted); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.column_deleted, (jintLong)lpStruct->column_deleted); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.row_reordered, (jintLong)lpStruct->row_reordered); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.column_reordered, (jintLong)lpStruct->column_reordered); + (*env)->SetIntLongField(env, lpObject, AtkTableIfaceFc.model_changed, (jintLong)lpStruct->model_changed); +} +#endif + #ifndef NO_AtkTextIface typedef struct AtkTextIface_FID_CACHE { int cached; jclass clazz; - jfieldID get_text, get_text_after_offset, get_text_at_offset, get_character_at_offset, get_text_before_offset, get_caret_offset, get_run_attributes, get_default_attributes, get_character_extents, get_character_count, get_offset_at_point, get_n_selections, get_selection, add_selection, remove_selection, set_selection, set_caret_offset, text_changed, text_caret_moved, text_selection_changed; + jfieldID get_text, get_text_after_offset, get_text_at_offset, get_character_at_offset, get_text_before_offset, get_caret_offset, get_run_attributes, get_default_attributes, get_character_extents, get_character_count, get_offset_at_point, get_n_selections, get_selection, add_selection, remove_selection, set_selection, set_caret_offset, text_changed, text_caret_moved, text_selection_changed, get_range_extents, get_bounded_ranges; } AtkTextIface_FID_CACHE; AtkTextIface_FID_CACHE AtkTextIfaceFc; @@ -385,6 +555,8 @@ void cacheAtkTextIfaceFields(JNIEnv *env, jobject lpObject) AtkTextIfaceFc.text_changed = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_changed", I_J); AtkTextIfaceFc.text_caret_moved = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_caret_moved", I_J); AtkTextIfaceFc.text_selection_changed = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_selection_changed", I_J); + AtkTextIfaceFc.get_range_extents = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_range_extents", I_J); + AtkTextIfaceFc.get_bounded_ranges = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_bounded_ranges", I_J); AtkTextIfaceFc.cached = 1; } @@ -411,6 +583,8 @@ AtkTextIface *getAtkTextIfaceFields(JNIEnv *env, jobject lpObject, AtkTextIface lpStruct->text_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.text_changed); lpStruct->text_caret_moved = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.text_caret_moved); lpStruct->text_selection_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.text_selection_changed); + lpStruct->get_range_extents = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_range_extents); + lpStruct->get_bounded_ranges = (AtkTextRange** (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_bounded_ranges); return lpStruct; } @@ -437,6 +611,134 @@ void setAtkTextIfaceFields(JNIEnv *env, jobject lpObject, AtkTextIface *lpStruct (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.text_changed, (jintLong)lpStruct->text_changed); (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.text_caret_moved, (jintLong)lpStruct->text_caret_moved); (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.text_selection_changed, (jintLong)lpStruct->text_selection_changed); + (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_range_extents, (jintLong)lpStruct->get_range_extents); + (*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_bounded_ranges, (jintLong)lpStruct->get_bounded_ranges); +} +#endif + +#ifndef NO_AtkTextRange +typedef struct AtkTextRange_FID_CACHE { + int cached; + jclass clazz; + jfieldID bounds, start_offset, end_offset, content; +} AtkTextRange_FID_CACHE; + +AtkTextRange_FID_CACHE AtkTextRangeFc; + +void cacheAtkTextRangeFields(JNIEnv *env, jobject lpObject) +{ + if (AtkTextRangeFc.cached) return; + AtkTextRangeFc.clazz = (*env)->GetObjectClass(env, lpObject); + AtkTextRangeFc.bounds = (*env)->GetFieldID(env, AtkTextRangeFc.clazz, "bounds", "Lorg/eclipse/swt/internal/accessibility/gtk/AtkTextRectangle;"); + AtkTextRangeFc.start_offset = (*env)->GetFieldID(env, AtkTextRangeFc.clazz, "start_offset", "I"); + AtkTextRangeFc.end_offset = (*env)->GetFieldID(env, AtkTextRangeFc.clazz, "end_offset", "I"); + AtkTextRangeFc.content = (*env)->GetFieldID(env, AtkTextRangeFc.clazz, "content", I_J); + AtkTextRangeFc.cached = 1; +} + +AtkTextRange *getAtkTextRangeFields(JNIEnv *env, jobject lpObject, AtkTextRange *lpStruct) +{ + if (!AtkTextRangeFc.cached) cacheAtkTextRangeFields(env, lpObject); + { + jobject lpObject1 = (*env)->GetObjectField(env, lpObject, AtkTextRangeFc.bounds); + if (lpObject1 != NULL) getAtkTextRectangleFields(env, lpObject1, &lpStruct->bounds); + } + lpStruct->start_offset = (*env)->GetIntField(env, lpObject, AtkTextRangeFc.start_offset); + lpStruct->end_offset = (*env)->GetIntField(env, lpObject, AtkTextRangeFc.end_offset); + lpStruct->content = (gchar *)(*env)->GetIntLongField(env, lpObject, AtkTextRangeFc.content); + return lpStruct; +} + +void setAtkTextRangeFields(JNIEnv *env, jobject lpObject, AtkTextRange *lpStruct) +{ + if (!AtkTextRangeFc.cached) cacheAtkTextRangeFields(env, lpObject); + { + jobject lpObject1 = (*env)->GetObjectField(env, lpObject, AtkTextRangeFc.bounds); + if (lpObject1 != NULL) setAtkTextRectangleFields(env, lpObject1, &lpStruct->bounds); + } + (*env)->SetIntField(env, lpObject, AtkTextRangeFc.start_offset, (jint)lpStruct->start_offset); + (*env)->SetIntField(env, lpObject, AtkTextRangeFc.end_offset, (jint)lpStruct->end_offset); + (*env)->SetIntLongField(env, lpObject, AtkTextRangeFc.content, (jintLong)lpStruct->content); +} +#endif + +#ifndef NO_AtkTextRectangle +typedef struct AtkTextRectangle_FID_CACHE { + int cached; + jclass clazz; + jfieldID x, y, width, height; +} AtkTextRectangle_FID_CACHE; + +AtkTextRectangle_FID_CACHE AtkTextRectangleFc; + +void cacheAtkTextRectangleFields(JNIEnv *env, jobject lpObject) +{ + if (AtkTextRectangleFc.cached) return; + AtkTextRectangleFc.clazz = (*env)->GetObjectClass(env, lpObject); + AtkTextRectangleFc.x = (*env)->GetFieldID(env, AtkTextRectangleFc.clazz, "x", "I"); + AtkTextRectangleFc.y = (*env)->GetFieldID(env, AtkTextRectangleFc.clazz, "y", "I"); + AtkTextRectangleFc.width = (*env)->GetFieldID(env, AtkTextRectangleFc.clazz, "width", "I"); + AtkTextRectangleFc.height = (*env)->GetFieldID(env, AtkTextRectangleFc.clazz, "height", "I"); + AtkTextRectangleFc.cached = 1; +} + +AtkTextRectangle *getAtkTextRectangleFields(JNIEnv *env, jobject lpObject, AtkTextRectangle *lpStruct) +{ + if (!AtkTextRectangleFc.cached) cacheAtkTextRectangleFields(env, lpObject); + lpStruct->x = (*env)->GetIntField(env, lpObject, AtkTextRectangleFc.x); + lpStruct->y = (*env)->GetIntField(env, lpObject, AtkTextRectangleFc.y); + lpStruct->width = (*env)->GetIntField(env, lpObject, AtkTextRectangleFc.width); + lpStruct->height = (*env)->GetIntField(env, lpObject, AtkTextRectangleFc.height); + return lpStruct; +} + +void setAtkTextRectangleFields(JNIEnv *env, jobject lpObject, AtkTextRectangle *lpStruct) +{ + if (!AtkTextRectangleFc.cached) cacheAtkTextRectangleFields(env, lpObject); + (*env)->SetIntField(env, lpObject, AtkTextRectangleFc.x, (jint)lpStruct->x); + (*env)->SetIntField(env, lpObject, AtkTextRectangleFc.y, (jint)lpStruct->y); + (*env)->SetIntField(env, lpObject, AtkTextRectangleFc.width, (jint)lpStruct->width); + (*env)->SetIntField(env, lpObject, AtkTextRectangleFc.height, (jint)lpStruct->height); +} +#endif + +#ifndef NO_AtkValueIface +typedef struct AtkValueIface_FID_CACHE { + int cached; + jclass clazz; + jfieldID get_current_value, get_maximum_value, get_minimum_value, set_current_value; +} AtkValueIface_FID_CACHE; + +AtkValueIface_FID_CACHE AtkValueIfaceFc; + +void cacheAtkValueIfaceFields(JNIEnv *env, jobject lpObject) +{ + if (AtkValueIfaceFc.cached) return; + AtkValueIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject); + AtkValueIfaceFc.get_current_value = (*env)->GetFieldID(env, AtkValueIfaceFc.clazz, "get_current_value", I_J); + AtkValueIfaceFc.get_maximum_value = (*env)->GetFieldID(env, AtkValueIfaceFc.clazz, "get_maximum_value", I_J); + AtkValueIfaceFc.get_minimum_value = (*env)->GetFieldID(env, AtkValueIfaceFc.clazz, "get_minimum_value", I_J); + AtkValueIfaceFc.set_current_value = (*env)->GetFieldID(env, AtkValueIfaceFc.clazz, "set_current_value", I_J); + AtkValueIfaceFc.cached = 1; +} + +AtkValueIface *getAtkValueIfaceFields(JNIEnv *env, jobject lpObject, AtkValueIface *lpStruct) +{ + if (!AtkValueIfaceFc.cached) cacheAtkValueIfaceFields(env, lpObject); + lpStruct->get_current_value = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkValueIfaceFc.get_current_value); + lpStruct->get_maximum_value = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkValueIfaceFc.get_maximum_value); + lpStruct->get_minimum_value = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkValueIfaceFc.get_minimum_value); + lpStruct->set_current_value = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkValueIfaceFc.set_current_value); + return lpStruct; +} + +void setAtkValueIfaceFields(JNIEnv *env, jobject lpObject, AtkValueIface *lpStruct) +{ + if (!AtkValueIfaceFc.cached) cacheAtkValueIfaceFields(env, lpObject); + (*env)->SetIntLongField(env, lpObject, AtkValueIfaceFc.get_current_value, (jintLong)lpStruct->get_current_value); + (*env)->SetIntLongField(env, lpObject, AtkValueIfaceFc.get_maximum_value, (jintLong)lpStruct->get_maximum_value); + (*env)->SetIntLongField(env, lpObject, AtkValueIfaceFc.get_minimum_value, (jintLong)lpStruct->get_minimum_value); + (*env)->SetIntLongField(env, lpObject, AtkValueIfaceFc.set_current_value, (jintLong)lpStruct->set_current_value); } #endif diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.h index 85e11a8810..b74dda3ba3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.h @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2009 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 @@ -27,6 +27,18 @@ void setAtkActionIfaceFields(JNIEnv *env, jobject lpObject, AtkActionIface *lpSt #define AtkActionIface_sizeof() 0 #endif +#ifndef NO_AtkAttribute +void cacheAtkAttributeFields(JNIEnv *env, jobject lpObject); +AtkAttribute *getAtkAttributeFields(JNIEnv *env, jobject lpObject, AtkAttribute *lpStruct); +void setAtkAttributeFields(JNIEnv *env, jobject lpObject, AtkAttribute *lpStruct); +#define AtkAttribute_sizeof() sizeof(AtkAttribute) +#else +#define cacheAtkAttributeFields(a,b) +#define getAtkAttributeFields(a,b,c) NULL +#define setAtkAttributeFields(a,b,c) +#define AtkAttribute_sizeof() 0 +#endif + #ifndef NO_AtkComponentIface void cacheAtkComponentIfaceFields(JNIEnv *env, jobject lpObject); AtkComponentIface *getAtkComponentIfaceFields(JNIEnv *env, jobject lpObject, AtkComponentIface *lpStruct); @@ -87,6 +99,18 @@ void setAtkSelectionIfaceFields(JNIEnv *env, jobject lpObject, AtkSelectionIface #define AtkSelectionIface_sizeof() 0 #endif +#ifndef NO_AtkTableIface +void cacheAtkTableIfaceFields(JNIEnv *env, jobject lpObject); +AtkTableIface *getAtkTableIfaceFields(JNIEnv *env, jobject lpObject, AtkTableIface *lpStruct); +void setAtkTableIfaceFields(JNIEnv *env, jobject lpObject, AtkTableIface *lpStruct); +#define AtkTableIface_sizeof() sizeof(AtkTableIface) +#else +#define cacheAtkTableIfaceFields(a,b) +#define getAtkTableIfaceFields(a,b,c) NULL +#define setAtkTableIfaceFields(a,b,c) +#define AtkTableIface_sizeof() 0 +#endif + #ifndef NO_AtkTextIface void cacheAtkTextIfaceFields(JNIEnv *env, jobject lpObject); AtkTextIface *getAtkTextIfaceFields(JNIEnv *env, jobject lpObject, AtkTextIface *lpStruct); @@ -99,6 +123,42 @@ void setAtkTextIfaceFields(JNIEnv *env, jobject lpObject, AtkTextIface *lpStruct #define AtkTextIface_sizeof() 0 #endif +#ifndef NO_AtkTextRange +void cacheAtkTextRangeFields(JNIEnv *env, jobject lpObject); +AtkTextRange *getAtkTextRangeFields(JNIEnv *env, jobject lpObject, AtkTextRange *lpStruct); +void setAtkTextRangeFields(JNIEnv *env, jobject lpObject, AtkTextRange *lpStruct); +#define AtkTextRange_sizeof() sizeof(AtkTextRange) +#else +#define cacheAtkTextRangeFields(a,b) +#define getAtkTextRangeFields(a,b,c) NULL +#define setAtkTextRangeFields(a,b,c) +#define AtkTextRange_sizeof() 0 +#endif + +#ifndef NO_AtkTextRectangle +void cacheAtkTextRectangleFields(JNIEnv *env, jobject lpObject); +AtkTextRectangle *getAtkTextRectangleFields(JNIEnv *env, jobject lpObject, AtkTextRectangle *lpStruct); +void setAtkTextRectangleFields(JNIEnv *env, jobject lpObject, AtkTextRectangle *lpStruct); +#define AtkTextRectangle_sizeof() sizeof(AtkTextRectangle) +#else +#define cacheAtkTextRectangleFields(a,b) +#define getAtkTextRectangleFields(a,b,c) NULL +#define setAtkTextRectangleFields(a,b,c) +#define AtkTextRectangle_sizeof() 0 +#endif + +#ifndef NO_AtkValueIface +void cacheAtkValueIfaceFields(JNIEnv *env, jobject lpObject); +AtkValueIface *getAtkValueIfaceFields(JNIEnv *env, jobject lpObject, AtkValueIface *lpStruct); +void setAtkValueIfaceFields(JNIEnv *env, jobject lpObject, AtkValueIface *lpStruct); +#define AtkValueIface_sizeof() sizeof(AtkValueIface) +#else +#define cacheAtkValueIfaceFields(a,b) +#define getAtkValueIfaceFields(a,b,c) NULL +#define setAtkValueIfaceFields(a,b,c) +#define AtkValueIface_sizeof() 0 +#endif + #ifndef NO_GtkAccessible void cacheGtkAccessibleFields(JNIEnv *env, jobject lpObject); GtkAccessible *getGtkAccessibleFields(JNIEnv *env, jobject lpObject, GtkAccessible *lpStruct); 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 f4a463a787..105c22db25 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 @@ -459,6 +459,78 @@ JNIEXPORT void JNICALL OS_NATIVE(G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR) } #endif +#ifndef NO_G_1TYPE_1BOOLEAN +JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1BOOLEAN) + (JNIEnv *env, jclass that) +{ + jintLong rc = 0; + OS_NATIVE_ENTER(env, that, G_1TYPE_1BOOLEAN_FUNC); + rc = (jintLong)G_TYPE_BOOLEAN; + OS_NATIVE_EXIT(env, that, G_1TYPE_1BOOLEAN_FUNC); + return rc; +} +#endif + +#ifndef NO_G_1TYPE_1DOUBLE +JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1DOUBLE) + (JNIEnv *env, jclass that) +{ + jintLong rc = 0; + OS_NATIVE_ENTER(env, that, G_1TYPE_1DOUBLE_FUNC); + rc = (jintLong)G_TYPE_DOUBLE; + OS_NATIVE_EXIT(env, that, G_1TYPE_1DOUBLE_FUNC); + return rc; +} +#endif + +#ifndef NO_G_1TYPE_1FLOAT +JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1FLOAT) + (JNIEnv *env, jclass that) +{ + jintLong rc = 0; + OS_NATIVE_ENTER(env, that, G_1TYPE_1FLOAT_FUNC); + rc = (jintLong)G_TYPE_FLOAT; + OS_NATIVE_EXIT(env, that, G_1TYPE_1FLOAT_FUNC); + return rc; +} +#endif + +#ifndef NO_G_1TYPE_1INT +JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1INT) + (JNIEnv *env, jclass that) +{ + jintLong rc = 0; + OS_NATIVE_ENTER(env, that, G_1TYPE_1INT_FUNC); + rc = (jintLong)G_TYPE_INT; + OS_NATIVE_EXIT(env, that, G_1TYPE_1INT_FUNC); + return rc; +} +#endif + +#ifndef NO_G_1TYPE_1INT64 +JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1INT64) + (JNIEnv *env, jclass that) +{ + jintLong rc = 0; + OS_NATIVE_ENTER(env, that, G_1TYPE_1INT64_FUNC); + rc = (jintLong)G_TYPE_INT64; + OS_NATIVE_EXIT(env, that, G_1TYPE_1INT64_FUNC); + return rc; +} +#endif + +#ifndef NO_G_1VALUE_1TYPE +JNIEXPORT jintLong JNICALL OS_NATIVE(G_1VALUE_1TYPE) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jintLong rc = 0; + OS_NATIVE_ENTER(env, that, G_1VALUE_1TYPE_FUNC); + rc = (jintLong)G_VALUE_TYPE(arg0); + OS_NATIVE_EXIT(env, that, G_1VALUE_1TYPE_FUNC); + return rc; +} +#endif + #ifndef NO_GdkColor_1sizeof JNIEXPORT jint JNICALL OS_NATIVE(GdkColor_1sizeof) (JNIEnv *env, jclass that) @@ -1643,30 +1715,6 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE_1NAME) } #endif -#ifndef NO__1G_1TYPE_1BOOLEAN -JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1TYPE_1BOOLEAN) - (JNIEnv *env, jclass that) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1G_1TYPE_1BOOLEAN_FUNC); - rc = (jintLong)G_TYPE_BOOLEAN; - OS_NATIVE_EXIT(env, that, _1G_1TYPE_1BOOLEAN_FUNC); - return rc; -} -#endif - -#ifndef NO__1G_1TYPE_1INT -JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1TYPE_1INT) - (JNIEnv *env, jclass that) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1G_1TYPE_1INT_FUNC); - rc = (jintLong)G_TYPE_INT; - OS_NATIVE_EXIT(env, that, _1G_1TYPE_1INT_FUNC); - return rc; -} -#endif - #ifndef NO__1G_1TYPE_1STRING JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1TYPE_1STRING) (JNIEnv *env, jclass that) @@ -2312,6 +2360,26 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1atk_1object_1add_1relationship) } #endif +#ifndef NO__1atk_1object_1remove_1relationship +JNIEXPORT jboolean JNICALL OS_NATIVE(_1atk_1object_1remove_1relationship) + (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2) +{ + jboolean rc = 0; + OS_NATIVE_ENTER(env, that, _1atk_1object_1remove_1relationship_FUNC); +/* + rc = (jboolean)atk_object_remove_relationship((AtkObject *)arg0, (AtkRelationType)arg1, (AtkObject *)arg2); +*/ + { + LOAD_FUNCTION(fp, atk_object_remove_relationship) + if (fp) { + rc = (jboolean)((jboolean (CALLING_CONVENTION*)(AtkObject *, AtkRelationType, AtkObject *))fp)((AtkObject *)arg0, (AtkRelationType)arg1, (AtkObject *)arg2); + } + } + OS_NATIVE_EXIT(env, that, _1atk_1object_1remove_1relationship_FUNC); + return rc; +} +#endif + #ifndef NO__1call JNIEXPORT jintLong JNICALL OS_NATIVE(_1call) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7) @@ -17061,6 +17129,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1size) } #endif +#ifndef NO__1pango_1font_1description_1get_1stretch +JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1stretch) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jint rc = 0; + OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1stretch_FUNC); + rc = (jint)pango_font_description_get_stretch((PangoFontDescription *)arg0); + OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1get_1stretch_FUNC); + return rc; +} +#endif + #ifndef NO__1pango_1font_1description_1get_1style JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1style) (JNIEnv *env, jclass that, jintLong arg0) @@ -17073,6 +17153,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1style) } #endif +#ifndef NO__1pango_1font_1description_1get_1variant +JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1variant) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jint rc = 0; + OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1variant_FUNC); + rc = (jint)pango_font_description_get_variant((PangoFontDescription *)arg0); + OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1get_1variant_FUNC); + return rc; +} +#endif + #ifndef NO__1pango_1font_1description_1get_1weight JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1weight) (JNIEnv *env, jclass that, jintLong arg0) @@ -17933,6 +18025,116 @@ JNIEXPORT void JNICALL OS_NATIVE(g_1main_1context_1wakeup) } #endif +#ifndef NO_g_1value_1get_1double +JNIEXPORT jdouble JNICALL OS_NATIVE(g_1value_1get_1double) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jdouble rc = 0; + OS_NATIVE_ENTER(env, that, g_1value_1get_1double_FUNC); + rc = (jdouble)g_value_get_double((GValue *)arg0); + OS_NATIVE_EXIT(env, that, g_1value_1get_1double_FUNC); + return rc; +} +#endif + +#ifndef NO_g_1value_1get_1float +JNIEXPORT jfloat JNICALL OS_NATIVE(g_1value_1get_1float) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jfloat rc = 0; + OS_NATIVE_ENTER(env, that, g_1value_1get_1float_FUNC); + rc = (jfloat)g_value_get_float((GValue *)arg0); + OS_NATIVE_EXIT(env, that, g_1value_1get_1float_FUNC); + return rc; +} +#endif + +#ifndef NO_g_1value_1get_1int +JNIEXPORT jint JNICALL OS_NATIVE(g_1value_1get_1int) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jint rc = 0; + OS_NATIVE_ENTER(env, that, g_1value_1get_1int_FUNC); + rc = (jint)g_value_get_int((GValue *)arg0); + OS_NATIVE_EXIT(env, that, g_1value_1get_1int_FUNC); + return rc; +} +#endif + +#ifndef NO_g_1value_1get_1int64 +JNIEXPORT jlong JNICALL OS_NATIVE(g_1value_1get_1int64) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jlong rc = 0; + OS_NATIVE_ENTER(env, that, g_1value_1get_1int64_FUNC); + rc = (jlong)g_value_get_int64((GValue *)arg0); + OS_NATIVE_EXIT(env, that, g_1value_1get_1int64_FUNC); + return rc; +} +#endif + +#ifndef NO_g_1value_1init +JNIEXPORT jintLong JNICALL OS_NATIVE(g_1value_1init) + (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +{ + jintLong rc = 0; + OS_NATIVE_ENTER(env, that, g_1value_1init_FUNC); + rc = (jintLong)g_value_init((GValue *)arg0, (GType)arg1); + OS_NATIVE_EXIT(env, that, g_1value_1init_FUNC); + return rc; +} +#endif + +#ifndef NO_g_1value_1set_1double +JNIEXPORT void JNICALL OS_NATIVE(g_1value_1set_1double) + (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) +{ + OS_NATIVE_ENTER(env, that, g_1value_1set_1double_FUNC); + g_value_set_double((GValue *)arg0, arg1); + OS_NATIVE_EXIT(env, that, g_1value_1set_1double_FUNC); +} +#endif + +#ifndef NO_g_1value_1set_1float +JNIEXPORT void JNICALL OS_NATIVE(g_1value_1set_1float) + (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1) +{ + OS_NATIVE_ENTER(env, that, g_1value_1set_1float_FUNC); + g_value_set_float((GValue *)arg0, arg1); + OS_NATIVE_EXIT(env, that, g_1value_1set_1float_FUNC); +} +#endif + +#ifndef NO_g_1value_1set_1int +JNIEXPORT void JNICALL OS_NATIVE(g_1value_1set_1int) + (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +{ + OS_NATIVE_ENTER(env, that, g_1value_1set_1int_FUNC); + g_value_set_int((GValue *)arg0, arg1); + OS_NATIVE_EXIT(env, that, g_1value_1set_1int_FUNC); +} +#endif + +#ifndef NO_g_1value_1set_1int64 +JNIEXPORT void JNICALL OS_NATIVE(g_1value_1set_1int64) + (JNIEnv *env, jclass that, jintLong arg0, jlong arg1) +{ + OS_NATIVE_ENTER(env, that, g_1value_1set_1int64_FUNC); + g_value_set_int64((GValue *)arg0, arg1); + OS_NATIVE_EXIT(env, that, g_1value_1set_1int64_FUNC); +} +#endif + +#ifndef NO_g_1value_1unset +JNIEXPORT void JNICALL OS_NATIVE(g_1value_1unset) + (JNIEnv *env, jclass that, jintLong arg0) +{ + OS_NATIVE_ENTER(env, that, g_1value_1unset_FUNC); + g_value_unset((GValue *)arg0); + OS_NATIVE_EXIT(env, that, g_1value_1unset_FUNC); +} +#endif + #ifndef NO_localeconv_1decimal_1point JNIEXPORT jintLong JNICALL OS_NATIVE(localeconv_1decimal_1point) (JNIEnv *env, jclass that) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h index 4099c5869a..5536099fff 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h @@ -129,6 +129,7 @@ #define gdk_x11_screen_lookup_visual_LIB "libgdk-x11-2.0.so.0" #define atk_object_add_relationship_LIB "libatk-1.0.so.0" +#define atk_object_remove_relationship_LIB "libatk-1.0.so.0" #define pango_attr_underline_color_new_LIB "libpango-1.0.so.0" #define pango_attr_strikethrough_color_new_LIB "libpango-1.0.so.0" #define pango_font_metrics_get_underline_thickness_LIB "libpango-1.0.so.0" 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 cf185a4ab5..4697d1b507 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 = 1334; -int OS_nativeFunctionCallCount[1334]; +int OS_nativeFunctionCount = 1353; +int OS_nativeFunctionCallCount[1353]; char * OS_nativeFunctionNames[] = { #ifndef JNI64 "Call__IIII", @@ -66,6 +66,12 @@ char * OS_nativeFunctionNames[] = { "GTypeQuery_1sizeof", "G_1OBJECT_1CLASS_1CONSTRUCTOR", "G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR", + "G_1TYPE_1BOOLEAN", + "G_1TYPE_1DOUBLE", + "G_1TYPE_1FLOAT", + "G_1TYPE_1INT", + "G_1TYPE_1INT64", + "G_1VALUE_1TYPE", "GdkColor_1sizeof", "GdkDragContext_1sizeof", "GdkEventAny_1sizeof", @@ -164,8 +170,6 @@ char * OS_nativeFunctionNames[] = { "_1G_1OBJECT_1GET_1CLASS", "_1G_1OBJECT_1TYPE", "_1G_1OBJECT_1TYPE_1NAME", - "_1G_1TYPE_1BOOLEAN", - "_1G_1TYPE_1INT", "_1G_1TYPE_1STRING", "_1PANGO_1PIXELS", "_1PANGO_1TYPE_1FONT_1DESCRIPTION", @@ -205,7 +209,9 @@ char * OS_nativeFunctionNames[] = { "_1XTestFakeKeyEvent", "_1XTestFakeMotionEvent", "_1XWarpPointer", + "_1access", "_1atk_1object_1add_1relationship", + "_1atk_1object_1remove_1relationship", "_1call", "_1dlclose", "_1dlopen", @@ -236,6 +242,7 @@ char * OS_nativeFunctionNames[] = { "_1g_1file_1new_1for_1path", "_1g_1file_1query_1info", "_1g_1file_1read", + "_1g_1file_1test", "_1g_1filename_1from_1uri", "_1g_1filename_1from_1utf8", "_1g_1filename_1to_1uri", @@ -1367,7 +1374,9 @@ char * OS_nativeFunctionNames[] = { "_1pango_1font_1description_1from_1string", "_1pango_1font_1description_1get_1family", "_1pango_1font_1description_1get_1size", + "_1pango_1font_1description_1get_1stretch", "_1pango_1font_1description_1get_1style", + "_1pango_1font_1description_1get_1variant", "_1pango_1font_1description_1get_1weight", "_1pango_1font_1description_1new", "_1pango_1font_1description_1set_1family", @@ -1433,6 +1442,16 @@ char * OS_nativeFunctionNames[] = { "_1pango_1tab_1array_1new", "_1pango_1tab_1array_1set_1tab", "g_1main_1context_1wakeup", + "g_1value_1get_1double", + "g_1value_1get_1float", + "g_1value_1get_1int", + "g_1value_1get_1int64", + "g_1value_1init", + "g_1value_1set_1double", + "g_1value_1set_1float", + "g_1value_1set_1int", + "g_1value_1set_1int64", + "g_1value_1unset", "localeconv_1decimal_1point", #ifndef JNI64 "memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I", 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 aed702c964..176327d877 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 @@ -74,6 +74,12 @@ typedef enum { GTypeQuery_1sizeof_FUNC, G_1OBJECT_1CLASS_1CONSTRUCTOR_FUNC, G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR_FUNC, + G_1TYPE_1BOOLEAN_FUNC, + G_1TYPE_1DOUBLE_FUNC, + G_1TYPE_1FLOAT_FUNC, + G_1TYPE_1INT_FUNC, + G_1TYPE_1INT64_FUNC, + G_1VALUE_1TYPE_FUNC, GdkColor_1sizeof_FUNC, GdkDragContext_1sizeof_FUNC, GdkEventAny_1sizeof_FUNC, @@ -172,8 +178,6 @@ typedef enum { _1G_1OBJECT_1GET_1CLASS_FUNC, _1G_1OBJECT_1TYPE_FUNC, _1G_1OBJECT_1TYPE_1NAME_FUNC, - _1G_1TYPE_1BOOLEAN_FUNC, - _1G_1TYPE_1INT_FUNC, _1G_1TYPE_1STRING_FUNC, _1PANGO_1PIXELS_FUNC, _1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC, @@ -215,6 +219,7 @@ typedef enum { _1XWarpPointer_FUNC, _1access_FUNC, _1atk_1object_1add_1relationship_FUNC, + _1atk_1object_1remove_1relationship_FUNC, _1call_FUNC, _1dlclose_FUNC, _1dlopen_FUNC, @@ -1377,7 +1382,9 @@ typedef enum { _1pango_1font_1description_1from_1string_FUNC, _1pango_1font_1description_1get_1family_FUNC, _1pango_1font_1description_1get_1size_FUNC, + _1pango_1font_1description_1get_1stretch_FUNC, _1pango_1font_1description_1get_1style_FUNC, + _1pango_1font_1description_1get_1variant_FUNC, _1pango_1font_1description_1get_1weight_FUNC, _1pango_1font_1description_1new_FUNC, _1pango_1font_1description_1set_1family_FUNC, @@ -1443,6 +1450,16 @@ typedef enum { _1pango_1tab_1array_1new_FUNC, _1pango_1tab_1array_1set_1tab_FUNC, g_1main_1context_1wakeup_FUNC, + g_1value_1get_1double_FUNC, + g_1value_1get_1float_FUNC, + g_1value_1get_1int_FUNC, + g_1value_1get_1int64_FUNC, + g_1value_1init_FUNC, + g_1value_1set_1double_FUNC, + g_1value_1set_1float_FUNC, + g_1value_1set_1int_FUNC, + g_1value_1set_1int64_FUNC, + g_1value_1unset_FUNC, localeconv_1decimal_1point_FUNC, #ifndef JNI64 memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC, |