Make sure that Microsoft New Phonetic input method in XP reports its number before...

diff --git a/source/NVDAObjects/IAccessible/mscandui.py b/source/NVDAObjects/IAccessible/mscandui.py
index 8a085bb..1ca18a4 100755 (executable)
--- a/source/NVDAObjects/IAccessible/mscandui.py
+++ b/source/NVDAObjects/IAccessible/mscandui.py
@@ -22,6 +22,10 @@ def reportSelectedCandidate(candidateObject,allowDuplicate=False):
 class BaseCandidateItem(CandidateItemBehavior,IAccessible):\r
 \r
        role=controlTypes.ROLE_LISTITEM\r
+       keyboardShortcut=""\r
+\r
+       def _get_candidateNumber(self):\r
+               return super(BaseCandidateItem,self).keyboardShortcut\r
 \r
        def _get_parent(self):\r
                parent=super(BaseCandidateItem,self).parent\r
@@ -30,12 +34,9 @@ class BaseCandidateItem(CandidateItemBehavior,IAccessible):
                parent.description=None\r
                return parent\r
 \r
-       def _get_keyboardShortcut(self):\r
-               return ""\r
-\r
        def _get_name(self):\r
                try:\r
-                       number=int(super(BaseCandidateItem,self).keyboardShortcut)\r
+                       number=int(self.candidateNumber)\r
                except (TypeError,ValueError):\r
                        return super(BaseCandidateItem,self).name\r
                word=super(BaseCandidateItem,self).name\r
@@ -133,7 +134,7 @@ class MSCandUI21(IAccessible):
 \r
 class MSCandUIWindow_candidateListItem(MSCandUI_candidateListItem):\r
 \r
-       def _get_value(self):\r
+       def _get_candidateNumber(self):\r
                index=self.IAccessibleChildID-2\r
                if index>0:\r
                        return unicode(index)\r