projects
/
platform
/
core
/
uifw
/
at-spi2-atk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated role enumeration in Accessibility_Role.idl.
[platform/core/uifw/at-spi2-atk.git]
/
cspi
/
spi_accessible.c
diff --git
a/cspi/spi_accessible.c
b/cspi/spi_accessible.c
index
f84bc65
..
6f5ff36
100644
(file)
--- a/
cspi/spi_accessible.c
+++ b/
cspi/spi_accessible.c
@@
-4,12
+4,17
@@
static const char *role_names [] =
{
"<invalid>",
static const char *role_names [] =
{
"<invalid>",
+ "accelerator label",
"alert",
"alert",
+ "animation",
+ "arrow",
+ "calendar",
"canvas",
"check box",
"color chooser",
"column header",
"combo box",
"canvas",
"check box",
"color chooser",
"column header",
"combo box",
+ "date editor",
"desktop icon",
"desktop frame",
"dialog",
"desktop icon",
"desktop frame",
"dialog",
@@
-17,10
+22,12
@@
static const char *role_names [] =
"file chooser",
"filler",
"focus traversable",
"file chooser",
"filler",
"focus traversable",
+ "font chooser",
"frame",
"glass pane",
"HTML container",
"icon",
"frame",
"glass pane",
"HTML container",
"icon",
+ "image",
"internal frame",
"label",
"layered pane",
"internal frame",
"label",
"layered pane",
@@
-38,17
+45,21
@@
static const char *role_names [] =
"progress bar",
"pushbutton",
"radiobutton",
"progress bar",
"pushbutton",
"radiobutton",
+ "radio menu item",
"root pane",
"row header",
"scrollbar",
"scrollpane",
"separator",
"slider",
"root pane",
"row header",
"scrollbar",
"scrollpane",
"separator",
"slider",
+ "spin button",
"split pane",
"split pane",
+ "status bar",
"table",
"table cell",
"table column header",
"table row header",
"table",
"table cell",
"table column header",
"table row header",
+ "tearoff menu item",
"text",
"toggle button",
"toolbar",
"text",
"toggle button",
"toolbar",
@@
-58,25
+69,16
@@
static const char *role_names [] =
"viewport",
"window",
"viewport",
"window",
- /* These have no equivalent AccessibleRole enum values */
- "accelerator label",
- "animation",
- "arrow",
- "calendar",
- "menu item",
- "date editor",
- "dial",
- "drawing area",
- "font chooser",
- "image",
- "radio menu item",
- "tearoff menu item",
- "spin button",
- "status bar",
};
#define MAX_ROLES (sizeof (role_names) / sizeof (char *))
};
#define MAX_ROLES (sizeof (role_names) / sizeof (char *))
+static AccessibleRole
+cspi_role_from_spi_role (Accessibility_Role role)
+{
+ return role; /* FIXME: need to compare, equivalence not guaranteed */
+}
+
/**
* AccessibleRole_getName:
* @role: an #AccessibleRole object to query.
/**
* AccessibleRole_getName:
* @role: an #AccessibleRole object to query.
@@
-335,7
+337,7
@@
Accessible_getRole (Accessible *obj)
cspi_return_val_if_ev ("getRole", SPI_ROLE_INVALID);
cspi_return_val_if_ev ("getRole", SPI_ROLE_INVALID);
- return
retval
;
+ return
cspi_role_from_spi_role (retval)
;
}
/**
}
/**