[orca] Treat checkable items with role menu item the same as checkable list items

[Joanmarie Diggs <joanied src gnome org>]

commit 40cdd5bbaf270d0d9e664c874ac90e938134e6c8
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Mar 9 14:13:59 2020 -0400

    Treat checkable items with role menu item the same as checkable list items
    
    Some applications expose combobox/listbox items with the list item role;
    others with the menu item role. We want the presentation of checkable
    items to be consistent.

 src/orca/formatting.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index 0b7b61489..76eb5f183 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -354,8 +354,8 @@ formatting = {
             },
         pyatspi.ROLE_MENU_ITEM: {
             'focused': 'expandableState',
-            'unfocused': 'labelOrName + menuItemCheckedState + expandableState + availability + ' + MNEMONIC 
+ ' + accelerator + pause + positionInList',
-            'basicWhereAmI': 'ancestors + pause + labelOrName + pause + accelerator + pause + positionInList 
+ ' + MNEMONIC
+            'unfocused': 'labelOrName + checkedStateIfCheckable + expandableState + availability + ' + 
MNEMONIC + ' + accelerator + pause + positionInList',
+            'basicWhereAmI': 'ancestors + pause + labelOrName + checkedStateIfCheckable + pause + 
accelerator + pause + positionInList + ' + MNEMONIC
             },
         pyatspi.ROLE_NOTIFICATION: {
             'unfocused': 'roleName + unrelatedLabels'
@@ -691,7 +691,7 @@ formatting = {
         pyatspi.ROLE_MENU_ITEM: {
             'unfocused': '[Component(obj,\
                                      asString(labelOrName + expandableState + availability) + 
asString(accelerator),\
-                                     indicator=asString(menuItemCheckedState))]'
+                                     indicator=asString(checkedStateIfCheckable))]'
             },
         pyatspi.ROLE_PAGE: {
             'unfocused': BRAILLE_TEXT