KeyboardProcessor.st
changeset 2585 8b60021d3d15
parent 2488 ed0fabedfe4e
child 2821 f4e296477b96
--- a/KeyboardProcessor.st	Wed Dec 17 14:40:12 2008 +0100
+++ b/KeyboardProcessor.st	Wed Dec 17 19:58:45 2008 +0100
@@ -259,18 +259,10 @@
             event consumed:true.
             action isSymbol ifTrue:[
                 app notNil ifTrue:[
-                    action numArgs == 1 ifTrue:[
-                        app perform:action with:event
-                    ] ifFalse:[
-                        app perform:action
-                    ].
+                    app perform:action withOptionalArgument:event
                 ]
             ] ifFalse:[
-                action numArgs == 1 ifTrue:[
-                    action value:event
-                ] ifFalse:[
-                    action value
-                ]
+                action valueWithOptionalArgument:event
             ].
             "/ ^ true
             ^ event consumed
@@ -280,15 +272,15 @@
             (key == #Return and:[returnIsOKInDialog ? true]) ifTrue:[
                 (wg notNil 
                 and:[(explicitFocusView := wg explicitFocusView) isNil
-                      or:[ explicitFocusView isKeyboardConsumer not 
-                      or:[ explicitFocusView isInputField ] ]
+                      or:[ false "explicitFocusView isKeyboardConsumer not" 
+                      or:[ explicitFocusView isInputField ]]
                 ]) ifTrue:[
                     ((focusView := wg focusView) notNil and:[focusView isTextView]) ifTrue:[
                         focusView isInputField ifFalse:[
                             "/ modalBox with a TextView
                             ^ false
                         ].
-                        "/ this is a kludge for subcanvas' input-fields, which
+                        "/ this is a kludge for subcanvases input-fields, which
                         "/ are not affected by #requestGlobalAutoAccept below.
                         focusView isAcceptOnReturn ifTrue:[
                             focusView accept
@@ -391,5 +383,5 @@
 !KeyboardProcessor class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/KeyboardProcessor.st,v 1.46 2008-06-04 09:05:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/KeyboardProcessor.st,v 1.47 2008-12-17 18:58:45 cg Exp $'
 ! !