[orca/570658] Get spin buttons working with new braille generator

[William Walker <wwalker src gnome org>]

commit 58e4a6481a745673f1e6305ae8053864eef98810
Author: Willie Walker <william walker sun com>
Date:   Sat Jun 27 06:53:03 2009 -0400

    Get spin buttons working with new braille generator
    
    This leaves comboboxes as the last thing to do for GTK+ widgets

 src/orca/formatting.py                       |    8 +++-----
 test/keystrokes/gtk-demo/role_spin_button.py |    4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index b22cc30..86926e1 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -462,11 +462,9 @@ formatting = {
                                      asString(label + value + roleName + required))]'
             },
         pyatspi.ROLE_SPIN_BUTTON: {
-            'unfocused': '[Text(obj,\
-                                asString(label),\
-                                asString(eol)),\
-                           (required and Region(" " + asString(required))) or [],\
-                           (readOnly and Region(" " + asString(readOnly))) or []]'
+            'unfocused': '[Text(obj, asString(label), asString(eol))]\
+                          + (required and [Region(" " + asString(required))] or [])\
+                          + (readOnly and [Region(" " + asString(readOnly))] or [])'
             },
         #pyatspi.ROLE_SPLIT_PANE: 'default'
         #pyatspi.ROLE_TABLE: 'default'
diff --git a/test/keystrokes/gtk-demo/role_spin_button.py b/test/keystrokes/gtk-demo/role_spin_button.py
index 6245e04..122f227 100644
--- a/test/keystrokes/gtk-demo/role_spin_button.py
+++ b/test/keystrokes/gtk-demo/role_spin_button.py
@@ -62,7 +62,7 @@ sequence.append(utils.AssertPresentationAction(
     "Hue spin button Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application Changing color ColorChooser ColorChooser Hue: 240 $l'",
      "     VISIBLE:  'Hue: 240 $l', cursor=9",
-     "SPEECH OUTPUT: 'Hue: spin button 240 selected.",
+     "SPEECH OUTPUT: 'Hue: spin button 240 selected.'",
      "SPEECH OUTPUT: 'Alt h'"]))
 
 ########################################################################
@@ -133,7 +133,7 @@ sequence.append(utils.AssertPresentationAction(
     "Hue spin button caret navigation",
     ["BRAILLE LINE:  'gtk-demo Application Changing color ColorChooser ColorChooser Hue: 240 $l'",
      "     VISIBLE:  'Hue: 240 $l', cursor=7",
-     "SPEECH OUTPUT: 'Hue: spin button 240.",
+     "SPEECH OUTPUT: 'Hue: spin button 240.'",
      "SPEECH OUTPUT: 'Alt h'"]))
 
 ########################################################################