Backing out patch for bug 347022 to fix Linux GTK2 bustage

This commit is contained in:
jwalden%mit.edu 2006-08-02 20:37:07 +00:00
parent e845180674
commit cf0595e90e
4 changed files with 6 additions and 6 deletions

View File

@ -434,7 +434,7 @@ interface nsIAccessible : nsISupports
const unsigned long ROLE_FILE_CHOOSER = 73;
const unsigned long ROLE_FILLER = 74;
const unsigned long ROLE_FONT_CHOOSER = 75;
const unsigned long ROLE_CHROME_WINDOW = 76;
const unsigned long ROLE_FRAME = 76;
const unsigned long ROLE_GLASS_PANE = 77;
const unsigned long ROLE_HTML_CONTAINER = 78;
const unsigned long ROLE_ICON = 79;

View File

@ -60,7 +60,7 @@ PRUint32 atkRoleMap[] = {
ATK_ROLE_MENU, // nsIAccessible::ROLE_MENUPOPUP 11
ATK_ROLE_MENU_ITEM, // nsIAccessible::ROLE_MENUITEM 12
ATK_ROLE_TOOL_TIP, // nsIAccessible::ROLE_TOOLTIP 13
ATK_ROLE_EMBEDDED, // nsIAccessible::ROLE_APPLICATION 14
ATK_ROLE_FRAME, // nsIAccessible::ROLE_APPLICATION 14
#ifdef USE_ATK_ROLE_DOCUMENT_FRAME
ATK_ROLE_DOCUMENT_FRAME, // nsIAccessible::ROLE_DOCUMENT 15
#else
@ -134,7 +134,7 @@ PRUint32 atkRoleMap[] = {
ATK_ROLE_FILE_CHOOSER, // nsIAccessible::ROLE_FILE_CHOOSER 73
ATK_ROLE_FILLER, // nsIAccessible::ROLE_FILLER 74
ATK_ROLE_FONT_CHOOSER, // nsIAccessible::ROLE_FONT_CHOOSER 75
ATK_ROLE_FRAME, // nsIAccessible::ROLE_CHROME_WINDOW 76
ATK_ROLE_FRAME, // nsIAccessible::ROLE_FRAME 76
ATK_ROLE_GLASS_PANE, // nsIAccessible::ROLE_GLASS_PANE 77
ATK_ROLE_HTML_CONTAINER, // nsIAccessible::ROLE_HTML_CONTAINER 78
ATK_ROLE_ICON, // nsIAccessible::ROLE_ICON 79
@ -224,7 +224,7 @@ PRUint32 atkRoleMap[] = {
#ifdef USE_ATK_ROLE_REDUNDANT_OBJECT
ATK_ROLE_REDUNDANT_OBJECT, // nsIAccessible::ROLE_REDUNDANT_OBJECT 111
#else
ATK_ROLE_INVALID, // nsIAccessible::ROLE_REDUNDANT_OBJECT 111
ATK_ROLE_INVALID, // nsIAccessible::ROLE_REDUNDANT_OBJECT 111
#endif
#ifdef USE_ATK_ROLE_FORM
ATK_ROLE_FORM, // nsIAccessible::ROLE_FORM 112

View File

@ -166,7 +166,7 @@ NS_IMETHODIMP nsDocAccessible::GetRole(PRUint32 *aRole)
PRInt32 itemType;
docShellTreeItem->GetItemType(&itemType);
if (itemType == nsIDocShellTreeItem::typeChrome) {
*aRole = ROLE_CHROME_WINDOW;
*aRole = ROLE_APPLICATION;
}
else if (itemType == nsIDocShellTreeItem::typeContent) {
#ifdef MOZ_XUL

View File

@ -135,7 +135,7 @@ PRUint32 msaaRoleMap[] = {
USE_ROLE_STRING, // nsIAccessible::ROLE_FILE_CHOOSER
USE_ROLE_STRING, // nsIAccessible::ROLE_FILLER
USE_ROLE_STRING, // nsIAccessible::ROLE_FONT_CHOOSER
ROLE_SYSTEM_APPLICATION, // nsIAccessible::ROLE_CHROME_WINDOW
USE_ROLE_STRING, // nsIAccessible::ROLE_FRAME
USE_ROLE_STRING, // nsIAccessible::ROLE_GLASS_PANE
USE_ROLE_STRING, // nsIAccessible::ROLE_HTML_CONTAINER
ROLE_SYSTEM_PUSHBUTTON, // nsIAccessible::ROLE_ICON