diff options
11 files changed, 36 insertions, 34 deletions
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.accessibility.gtk.ATK.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.accessibility.gtk.ATK.properties index 1ca7b80fc4..03558b6a73 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.accessibility.gtk.ATK.properties +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.accessibility.gtk.ATK.properties @@ -36,11 +36,6 @@ ATK__atk_focus_tracker_notify_0=cast=(AtkObject *) ATK__atk_get_default_registry= -ATK__atk_object_add_relationship= -ATK__atk_object_add_relationship_0=cast=(AtkObject *) -ATK__atk_object_add_relationship_1=cast=(AtkRelationType) -ATK__atk_object_add_relationship_2=cast=(AtkObject *) - ATK__atk_object_factory_create_accessible= ATK__atk_object_factory_create_accessible_0=cast=(AtkObjectFactory *) ATK__atk_object_factory_create_accessible_1=cast=(GObject *) diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties index 80d963f364..956aec2466 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties @@ -824,6 +824,11 @@ OS__XWarpPointer_6= OS__XWarpPointer_7= OS__XWarpPointer_8= +OS__atk_object_add_relationship= +OS__atk_object_add_relationship_0=cast=(AtkObject *) +OS__atk_object_add_relationship_1=cast=(AtkRelationType) +OS__atk_object_add_relationship_2=cast=(AtkObject *) + OS__g_cclosure_new= OS__g_cclosure_new_0=cast=(GCallback) OS__g_cclosure_new_1=cast=(gpointer) 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 68fe4b77c6..709643b211 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 @@ -137,18 +137,6 @@ JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1get_1default_1registry) } #endif -#ifndef NO__1atk_1object_1add_1relationship -JNIEXPORT jboolean JNICALL ATK_NATIVE(_1atk_1object_1add_1relationship) - (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2) -{ - jboolean rc = 0; - ATK_NATIVE_ENTER(env, that, _1atk_1object_1add_1relationship_FUNC); - rc = (jboolean)atk_object_add_relationship((AtkObject *)arg0, (AtkRelationType)arg1, (AtkObject *)arg2); - ATK_NATIVE_EXIT(env, that, _1atk_1object_1add_1relationship_FUNC); - return rc; -} -#endif - #ifndef NO__1atk_1object_1factory_1create_1accessible JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1object_1factory_1create_1accessible) (JNIEnv *env, jclass that, jint arg0, jint 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 b37d5ecd0e..a98d8a8203 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 @@ -18,8 +18,8 @@ #ifdef NATIVE_STATS -int ATK_nativeFunctionCount = 43; -int ATK_nativeFunctionCallCount[43]; +int ATK_nativeFunctionCount = 42; +int ATK_nativeFunctionCallCount[42]; char * ATK_nativeFunctionNames[] = { "AtkObjectFactoryClass_1sizeof", "AtkObjectFactory_1sizeof", @@ -31,7 +31,6 @@ char * ATK_nativeFunctionNames[] = { "_1GTK_1ACCESSIBLE", "_1atk_1focus_1tracker_1notify", "_1atk_1get_1default_1registry", - "_1atk_1object_1add_1relationship", "_1atk_1object_1factory_1create_1accessible", "_1atk_1object_1factory_1get_1accessible_1type", "_1atk_1object_1initialize", 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 b43ffb7022..06d791d9b4 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 @@ -35,7 +35,6 @@ typedef enum { _1GTK_1ACCESSIBLE_FUNC, _1atk_1focus_1tracker_1notify_FUNC, _1atk_1get_1default_1registry_FUNC, - _1atk_1object_1add_1relationship_FUNC, _1atk_1object_1factory_1create_1accessible_FUNC, _1atk_1object_1factory_1get_1accessible_1type_FUNC, _1atk_1object_1initialize_FUNC, 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 1582bce6ca..7c7adb68f2 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 @@ -1793,6 +1793,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XWarpPointer) } #endif +#ifndef NO__1atk_1object_1add_1relationship +JNIEXPORT jboolean JNICALL OS_NATIVE(_1atk_1object_1add_1relationship) + (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2) +{ + jboolean rc = 0; + OS_NATIVE_ENTER(env, that, _1atk_1object_1add_1relationship_FUNC); + rc = (jboolean)atk_object_add_relationship((AtkObject *)arg0, (AtkRelationType)arg1, (AtkObject *)arg2); + OS_NATIVE_EXIT(env, that, _1atk_1object_1add_1relationship_FUNC); + return rc; +} +#endif + #ifndef NO__1g_1cclosure_1new JNIEXPORT jint JNICALL OS_NATIVE(_1g_1cclosure_1new) (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2) 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 2431df2bf6..43586606b5 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 = 1023; -int OS_nativeFunctionCallCount[1023]; +int OS_nativeFunctionCount = 1024; +int OS_nativeFunctionCallCount[1024]; char * OS_nativeFunctionNames[] = { "Call", "GDK_1WINDOWING_1X11", @@ -158,6 +158,7 @@ char * OS_nativeFunctionNames[] = { "_1XTestFakeKeyEvent", "_1XTestFakeMotionEvent", "_1XWarpPointer", + "_1atk_1object_1add_1relationship", "_1g_1cclosure_1new", "_1g_1closure_1ref", "_1g_1closure_1unref", 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 d72d02d72c..dc92f4c7c1 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 @@ -162,6 +162,7 @@ typedef enum { _1XTestFakeKeyEvent_FUNC, _1XTestFakeMotionEvent_FUNC, _1XWarpPointer_FUNC, + _1atk_1object_1add_1relationship_FUNC, _1g_1cclosure_1new_FUNC, _1g_1closure_1ref_FUNC, _1g_1closure_1unref_FUNC, 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 cc4203b6ab..1a03a31e3e 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 @@ -177,15 +177,6 @@ public static final int /*long*/ atk_object_factory_get_accessible_type (int /*l lock.unlock(); } } -public static final native boolean _atk_object_add_relationship (int /*long*/ object, int relationship, int /*long*/ target); -public static final boolean atk_object_add_relationship (int /*long*/ object, int relationship, int /*long*/ target) { - lock.lock(); - try { - return _atk_object_add_relationship(object, relationship, target); - } finally { - lock.unlock(); - } -} public static final native void _atk_object_initialize (int /*long*/ accessible, int /*long*/ data); public static final void atk_object_initialize (int /*long*/ accessible, int /*long*/ data) { lock.lock(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java index ff81b39c95..1f98b0ad84 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java @@ -35,6 +35,7 @@ public class OS extends Platform { } /** Constants */ + public static final int ATK_RELATION_LABELLED_BY = 4; public static final int G_SIGNAL_MATCH_DATA = 1 << 4; public static final int G_SIGNAL_MATCH_ID = 1 << 0; public static final int GDK_2BUTTON_PRESS = 0x5; @@ -242,6 +243,8 @@ public class OS extends Platform { public static final int GTK_FILE_CHOOSER_ACTION_SAVE = 1; public static final int GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER = 2; public static final int GTK_HAS_FOCUS = 1 << 12; + public static final int GTK_ICON_SIZE_SMALL_TOOLBAR = 2; + public static final int GTK_ICON_SIZE_LARGE_TOOLBAR = 3; public static final int GTK_ICON_SIZE_DIALOG = 6; public static final int GTK_JUSTIFY_CENTER = 0x2; public static final int GTK_JUSTIFY_LEFT = 0x0; @@ -8575,4 +8578,13 @@ public static final void pango_tab_array_set_tab(int /*long*/ tab_array, int tab lock.unlock(); } } +public static final native boolean _atk_object_add_relationship (int /*long*/ object, int relationship, int /*long*/ target); +public static final boolean atk_object_add_relationship (int /*long*/ object, int relationship, int /*long*/ target) { + lock.lock(); + try { + return _atk_object_add_relationship(object, relationship, target); + } finally { + lock.unlock(); + } +} } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java index 4803a4f618..8d9c55a0c6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java @@ -13,7 +13,6 @@ package org.eclipse.swt.widgets; import org.eclipse.swt.*; import org.eclipse.swt.internal.*; -import org.eclipse.swt.internal.accessibility.gtk.ATK; import org.eclipse.swt.internal.gtk.*; import org.eclipse.swt.graphics.*; @@ -100,7 +99,7 @@ void addRelation (Control control) { int /*long*/ accessible = OS.gtk_widget_get_accessible (labelHandle); int /*long*/ controlAccessible = OS.gtk_widget_get_accessible (control.handle); if (accessible != 0 && controlAccessible != 0) { - ATK.atk_object_add_relationship (controlAccessible, ATK.ATK_RELATION_LABELLED_BY, accessible); + OS.atk_object_add_relationship (controlAccessible, OS.ATK_RELATION_LABELLED_BY, accessible); } } |