[orca/570658] Make sure the label of a combo box is part of the braille component region

[William Walker <wwalker src gnome org>]

commit b56b64f55b58165fcd0440160fe3d9b429264919
Author: Willie Walker <william walker sun com>
Date:   Sat Jun 27 10:35:59 2009 -0400

    Make sure the label of a combo box is part of the braille component region
    
    Prior to this, it was a separate Region object and was scrolled off the
    braille display.  I think this represents a good bug fix.

 src/orca/formatting.py                      |    5 ++---
 test/keystrokes/gtk-demo/role_combo_box2.py |   12 ++++++------
 2 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index aff61e8..8d69f4c 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -368,9 +368,8 @@ formatting = {
             # We could then use the cursorOffset field to indicate where the
             # combobox starts.]]]
             #
-            'unfocused': '(label and [Region(asString(label) + " ")])\
-                          + ((comboBoxTextObj and [Text(comboBoxTextObj[0])])\
-                             or [Component(obj, asString(displayedText))])\
+            'unfocused': '((comboBoxTextObj and [Text(comboBoxTextObj[0], asString(label))])\
+                           or [Component(obj, asString(label + displayedText), label and (len(asString(label)) + 1) or 0)])\
                           + [Region(" " + asString(roleName))]'
             },
         #pyatspi.ROLE_DESKTOP_ICON: 'default'
diff --git a/test/keystrokes/gtk-demo/role_combo_box2.py b/test/keystrokes/gtk-demo/role_combo_box2.py
index 2e09b96..c789627 100644
--- a/test/keystrokes/gtk-demo/role_combo_box2.py
+++ b/test/keystrokes/gtk-demo/role_combo_box2.py
@@ -39,7 +39,7 @@ sequence.append(WaitForFocus("All sheets", acc_role=pyatspi.ROLE_COMBO_BOX))
 sequence.append(utils.AssertPresentationAction(
     "All sheets combo box item",
     ["BRAILLE LINE:  'gtk-demo Application Print Dialog TabList Page Setup Page Layout Filler Only print: All sheets Combo'",
-     "     VISIBLE:  'All sheets Combo', cursor=1",
+     "     VISIBLE:  'Only print: All sheets Combo', cursor=13",
      "SPEECH OUTPUT: 'Layout Only print: All sheets combo box'"]))
 
 ########################################################################
@@ -51,8 +51,8 @@ sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "All sheets combo box item Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application Print Dialog TabList Page Setup Page Layout Filler Only print: All sheets Combo'",
-     "     VISIBLE:  'All sheets Combo', cursor=1",
-     "SPEECH OUTPUT: 'Only print: combo box All sheets item 1 of 3.",
+     "     VISIBLE:  'Only print: All sheets Combo', cursor=13",
+     "SPEECH OUTPUT: 'Only print: combo box All sheets item 1 of 3.'",
      "SPEECH OUTPUT: 'Alt o'"]))
 
 ########################################################################
@@ -68,7 +68,7 @@ sequence.append(WaitAction("object:selection-changed",
 sequence.append(utils.AssertPresentationAction(
     "Event sheets combo box item",
     ["BRAILLE LINE:  'gtk-demo Application Print Dialog TabList Page Setup Page Layout Filler Only print: Even sheets Combo'",
-     "     VISIBLE:  'Even sheets Combo', cursor=1",
+     "     VISIBLE:  'Only print: Even sheets Combo', cursor=13",
      "SPEECH OUTPUT: 'Even sheets'"]))
 
 ########################################################################
@@ -80,8 +80,8 @@ sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Even sheets combo box item Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application Print Dialog TabList Page Setup Page Layout Filler Only print: Even sheets Combo'",
-     "     VISIBLE:  'Even sheets Combo', cursor=1",
-     "SPEECH OUTPUT: 'Only print: combo box Even sheets item 2 of 3.",
+     "     VISIBLE:  'Only print: Even sheets Combo', cursor=13",
+     "SPEECH OUTPUT: 'Only print: combo box Even sheets item 2 of 3.'",
      "SPEECH OUTPUT: 'Alt o'"]))
 
 ########################################################################