From 12fe180d628fc0499d43c83b92ba8a5f87bc943a Mon Sep 17 00:00:00 2001 From: Joanmarie Diggs Date: Sat, 2 Jul 2011 15:05:05 -0400 Subject: Fix for bug 651343 - New ATK Roles --- atk/atkobject.c | 32 ++++++++++++++++++++++++++++++-- atk/atkobject.h | 28 +++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/atk/atkobject.c b/atk/atkobject.c index b498c18..6f64a65 100755 --- a/atk/atkobject.c +++ b/atk/atkobject.c @@ -162,6 +162,19 @@ enum { N_("form") N_("link") N_("input method window") + N_("table row") + N_("tree item") + N_("document spreadsheet") + N_("document presentation") + N_("document text") + N_("document web") + N_("document email") + N_("comment") + N_("list box") + N_("grouping") + N_("image map") + N_("notification") + N_("info bar") #endif /* 0 */ static const char roles[] = @@ -252,7 +265,20 @@ static const char roles[] = "redundant object\0" "form\0" "link\0" - "input method window"; + "input method window\0" + "table row\0" + "tree item\0" + "document spreadsheet\0" + "document presentation\0" + "document text\0" + "document web\0" + "document email\0" + "comment\0" + "list box\0" + "grouping\0" + "image map\0" + "notification\0" + "info bar\0"; static const guint16 roles_offsets[] = { 0, 8, 26, 32, 42, 48, 57, 64, @@ -265,7 +291,9 @@ static const guint16 roles_offsets[] = { 585, 605, 622, 641, 650, 655, 669, 678, 687, 692, 703, 711, 720, 727, 734, 741, 751, 757, 769, 782, 791, 810, 816, 822, - 830, 845, 853, 858, 866, 883, 888, 893 + 830, 845, 853, 858, 866, 883, 888, 893, + 913, 923, 933, 954, 976, 990, 1003, 1018, + 1026, 1035, 1044, 1054, 1067 }; /* This is a static assertion */ diff --git a/atk/atkobject.h b/atk/atkobject.h index b8f8a08..61b16d0 100755 --- a/atk/atkobject.h +++ b/atk/atkobject.h @@ -53,7 +53,7 @@ G_BEGIN_DECLS *@ATK_ROLE_CHECK_MENU_ITEM: A menu item with a check box *@ATK_ROLE_COLOR_CHOOSER: A specialized dialog that lets the user choose a color *@ATK_ROLE_COLUMN_HEADER: The header for a column of data - *@ATK_ROLE_COMBO_BOX: A list of choices the user can select from + *@ATK_ROLE_COMBO_BOX: A collapsible list of choices the user can select from *@ATK_ROLE_DATE_EDITOR: An object whose purpose is to allow a user to edit a date *@ATK_ROLE_DESKTOP_ICON: An inconifed internal frame within a DESKTOP_PANE *@ATK_ROLE_DESKTOP_FRAME: A pane that supports internal frames and iconified versions of those internal frames @@ -139,6 +139,19 @@ G_BEGIN_DECLS *@ATK_ROLE_INPUT_METHOD_WINDOW: The object is a window or similar viewport * which is used to allow composition or input of a 'complex character', * in other words it is an "input method window." @Since: ATK-1.12.1 + *@ATK_ROLE_TABLE_ROW: A row in a table. @Since: ATK-2.0.2 + *@ATK_ROLE_TREE_ITEM: An object that represents an element of a tree. @Since: ATK-2.0.2 + *@ATK_ROLE_DOCUMENT_SPREADSHEET: A document frame which contains a spreadsheet. @Since: ATK-2.0.2 + *@ATK_ROLE_DOCUMENT_PRESENTATION: A document frame which contains a presentation or slide content. @Since: ATK-2.0.2 + *@ATK_ROLE_DOCUMENT_TEXT: A document frame which contains textual content, such as found in a word processing application. @Since: ATK-2.0.2 + *@ATK_ROLE_DOCUMENT_WEB: A document frame which contains HTML or other markup suitable for display in a web browser. @Since: ATK-2.0.2 + *@ATK_ROLE_DOCUMENT_EMAIL: A document frame which contains email content to be displayed or composed either in plain text or HTML. @Since: ATK-2.0.2 + *@ATK_ROLE_COMMENT: An object found within a document and designed to present a comment, note, or other annotation. In some cases, this object might not be visible until activated. @Since: ATK-2.0.2 + *@ATK_ROLE_LIST_BOX: A non-collapsible list of choices the user can select from. @Since: ATK-2.0.2 + *@ATK_ROLE_GROUPING: A group of related widgets. This group typically has a label. @Since: ATK-2.0.2 + *@ATK_ROLE_IMAGE_MAP: An image map object. Usually a graphic with multiple hotspots, where each hotspot can be activated resulting in the loading of another document or section of a document. @Since: ATK-2.0.2 + *@ATK_ROLE_NOTIFICATION: A transitory object designed to present a message to the user, typically at the desktop level rather than inside a particular application. @Since: ATK-2.0.2 + *@ATK_ROLE_INFO_BAR: An object designed to present a message to the user within an existing window. @Since: ATK-2.0.2 *@ATK_ROLE_LAST_DEFINED: not a valid role, used for finding end of the enumeration * * Describes the role of an object @@ -237,6 +250,19 @@ typedef enum ATK_ROLE_FORM, ATK_ROLE_LINK, ATK_ROLE_INPUT_METHOD_WINDOW, + ATK_ROLE_TABLE_ROW, + ATK_ROLE_TREE_ITEM, + ATK_ROLE_DOCUMENT_SPREADSHEET, + ATK_ROLE_DOCUMENT_PRESENTATION, + ATK_ROLE_DOCUMENT_TEXT, + ATK_ROLE_DOCUMENT_WEB, + ATK_ROLE_DOCUMENT_EMAIL, + ATK_ROLE_COMMENT, + ATK_ROLE_LIST_BOX, + ATK_ROLE_GROUPING, + ATK_ROLE_IMAGE_MAP, + ATK_ROLE_NOTIFICATION, + ATK_ROLE_INFO_BAR, ATK_ROLE_LAST_DEFINED } AtkRole; -- cgit v1.2.1