From cfb1589dcb87b70fc3c9d16bfbbd73fbebff8aca Mon Sep 17 00:00:00 2001 From: "aaronleventhal%moonset.net" Date: Sat, 4 Aug 2007 01:56:12 +0000 Subject: [PATCH] Bug 382247. JAWS says submenu for ARIA menuitems with a text node child. r=simon.bates, a=dsicore git-svn-id: svn://10.0.0.236/trunk@231469 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/accessible/src/msaa/nsAccessibleWrap.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mozilla/accessible/src/msaa/nsAccessibleWrap.h b/mozilla/accessible/src/msaa/nsAccessibleWrap.h index 80a5ead8fcb..0d0bb0a4afd 100644 --- a/mozilla/accessible/src/msaa/nsAccessibleWrap.h +++ b/mozilla/accessible/src/msaa/nsAccessibleWrap.h @@ -324,7 +324,13 @@ protected: // Should this accessible be allowed to have any MSAA children static PRBool MustPrune(nsIAccessible *accessible) - { PRUint32 role; return NS_SUCCEEDED(accessible->GetRole(&role)) && (role == nsIAccessibleRole::ROLE_ENTRY || role == nsIAccessibleRole::ROLE_PASSWORD_TEXT || role == nsIAccessibleRole::ROLE_PUSHBUTTON); } + { + PRUint32 role = Role(accessible); + return role == nsIAccessibleRole::ROLE_MENUITEM || + role == nsIAccessibleRole::ROLE_ENTRY || + role == nsIAccessibleRole::ROLE_PASSWORD_TEXT || + role == nsIAccessibleRole::ROLE_PUSHBUTTON; + } enum navRelations { NAVRELATION_CONTROLLED_BY = 0x1000,