summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
diff options
context:
space:
mode:
authorSilenio Quarti <silenio>2010-02-03 19:25:10 +0000
committerSilenio Quarti <silenio>2010-02-03 19:25:10 +0000
commit1edf4eee84d4f2cf27e277497eba0ba3f8932735 (patch)
treebb1440dce2b7c978940c1af4ae8c0271bf5b4344 /bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
parent2e1674e52f63ec3278ded235e29285ae20c28d8f (diff)
downloadeclipse.platform.swt-1edf4eee84d4f2cf27e277497eba0ba3f8932735.tar.gz
eclipse.platform.swt-1edf4eee84d4f2cf27e277497eba0ba3f8932735.tar.xz
eclipse.platform.swt-1edf4eee84d4f2cf27e277497eba0ba3f8932735.zip
*** empty log message ***
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
index d485b7c656..b36b3f224d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
@@ -360,11 +360,6 @@ class AccessibleObject {
static int /*long*/ atkComponent_ref_accessible_at_point (int /*long*/ atkObject, int /*long*/ x, int /*long*/ y, int /*long*/ coord_type) {
if (DEBUG) print ("-->atkComponent_ref_accessible_at_point: " + atkObject + " " + x + "," + y);
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
- AtkComponentIface iface = getComponentIface (atkObject);
- if (iface != null && iface.ref_accessible_at_point != 0) {
- parentResult = ATK.call (iface.ref_accessible_at_point, atkObject, x, y, coord_type);
- }
if (object != null) {
Accessible accessible = object.accessible;
Vector listeners = accessible.accessibleControlListeners;
@@ -387,11 +382,15 @@ class AccessibleObject {
Accessible result = event.accessible;
AccessibleObject accObj = result != null ? result.getAccessibleObject() : object.getChildByID (event.childID);
if (accObj != null) {
- if (parentResult != 0) OS.g_object_unref (parentResult);
return OS.g_object_ref (accObj.handle);
}
}
}
+ int /*long*/ parentResult = 0;
+ AtkComponentIface iface = getComponentIface (atkObject);
+ if (iface != null && iface.ref_accessible_at_point != 0) {
+ parentResult = ATK.call (iface.ref_accessible_at_point, atkObject, x, y, coord_type);
+ }
return parentResult;
}
@@ -2653,6 +2652,7 @@ class AccessibleObject {
AccessibleObject getChildByID (int childId) {
if (childId == ACC.CHILDID_SELF) return this;
+ if (childId == ACC.CHILDID_NONE || childId == ACC.CHILDID_MULTIPLE) return null;
if (children != null) {
for (int i = 0; i < children.length; i++) {
if (children[i] != null && children[i].id == childId) return children [0];