[orca/570658] Do not guess the label for ROLE_ENTRY, ROLE_COMBO_BOX, and ROLE_TOGGLE_BUTTON

[William Walker <wwalker src gnome org>]

commit da05c0c20d09b802667fb8b3024a1497fd24ee76
Author: Willie Walker <william walker sun com>
Date:   Wed Jul 1 10:40:34 2009 -0400

    Do not guess the label for ROLE_ENTRY, ROLE_COMBO_BOX, and ROLE_TOGGLE_BUTTON

 .../scripts/toolkits/Gecko/braille_generator.py    |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/braille_generator.py b/src/orca/scripts/toolkits/Gecko/braille_generator.py
index 1d49d5f..5c68a36 100644
--- a/src/orca/scripts/toolkits/Gecko/braille_generator.py
+++ b/src/orca/scripts/toolkits/Gecko/braille_generator.py
@@ -157,14 +157,23 @@ class BrailleGenerator(braille_generator.BrailleGenerator):
         role = args.get('role', obj.getRole())
         # We'll attempt to guess the label under some circumstances.
         #
+        # [[[TODO: WDW - ROLE_ENTRY is noticeably absent from here.  If
+        # we include it here, the label_guess_bug_546815.py tests will
+        # end up showing the label twice.  So, I've pulled the ROLE_ENTRY
+        # out of here.  The effect of that is that we go back to the old
+        # way where the entry will appear on the same line as the text.
+        # I think there's a bug lurking there, though, in that the EOC for
+        # the entry seems to still exist on the braille line.  This was
+        # in the old (pre-refactor) code, too]]]
+        #
+        # [[[TODO: WDW - ROLE_CHECK_BOX and ROLE_RADIO_BUTTON are absent
+        # for reasons similar to ROLE_ENTRY.]]]
+        #
         if not len(result) \
-           and role in [pyatspi.ROLE_CHECK_BOX,
-                        pyatspi.ROLE_COMBO_BOX,
-                        pyatspi.ROLE_ENTRY,
+           and role in [pyatspi.ROLE_COMBO_BOX,
                         pyatspi.ROLE_LIST,
                         pyatspi.ROLE_PARAGRAPH,
                         pyatspi.ROLE_PASSWORD_TEXT,
-                        pyatspi.ROLE_RADIO_BUTTON,
                         pyatspi.ROLE_TEXT] \
            and self._script.inDocumentContent() \
            and not self._script.isAriaWidget(obj):