Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2010-04-09 20:33:21 +0000
committerSilenio Quarti2010-04-09 20:33:21 +0000
commit90c029f30a1eddb937e6119046ac7f99f5d0e003 (patch)
tree08fc0a8c4c8d39630da54992c45264479d860293 /bundles/org.eclipse.swt
parentee868479a85b1a312e444c303f453ee8d55cd3a1 (diff)
downloadeclipse.platform.swt-90c029f30a1eddb937e6119046ac7f99f5d0e003.tar.gz
eclipse.platform.swt-90c029f30a1eddb937e6119046ac7f99f5d0e003.tar.xz
eclipse.platform.swt-90c029f30a1eddb937e6119046ac7f99f5d0e003.zip
object attributes
Diffstat (limited to 'bundles/org.eclipse.swt')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.h2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java2
3 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.h
index 57babcffbe..8151da8eb5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.h
@@ -19,6 +19,8 @@
#if (GTK_MAJOR_VERSION>=2 && GTK_MINOR_VERSION>=10)
#define SWT_AtkObjectClass_get_attributes get_attributes
+#define SWT_AtkObjectClass_get_attributes_cast AtkAttributeSet* (*)()
#else
#define SWT_AtkObjectClass_get_attributes pad1
+#define SWT_AtkObjectClass_get_attributes_cast AtkFunction
#endif
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 f9322f40a8..0f18573992 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
@@ -266,7 +266,7 @@ AtkObjectClass *getAtkObjectClassFields(JNIEnv *env, jobject lpObject, AtkObject
lpStruct->property_change = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.property_change);
lpStruct->state_change = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.state_change);
lpStruct->visible_data_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.visible_data_changed);
- lpStruct->SWT_AtkObjectClass_get_attributes = (AtkAttributeSet* (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_attributes);
+ lpStruct->SWT_AtkObjectClass_get_attributes = (SWT_AtkObjectClass_get_attributes_cast)(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_attributes);
return lpStruct;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java
index 6800d688a6..a8d4f9cdb5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java
@@ -62,6 +62,6 @@ public class AtkObjectClass {
public int /*long*/ state_change;
/** @field cast=(void (*)()) */
public int /*long*/ visible_data_changed;
- /** @field accessor=SWT_AtkObjectClass_get_attributes,cast=(AtkAttributeSet* (*)()) */
+ /** @field accessor=SWT_AtkObjectClass_get_attributes,cast=(SWT_AtkObjectClass_get_attributes_cast) */
public int /*long*/ get_attributes;
}

Back to the top