--- a/DialogBox.st Wed Dec 17 19:56:21 2008 +0100
+++ b/DialogBox.st Wed Dec 17 19:59:32 2008 +0100
@@ -1775,11 +1775,9 @@
actions:(buttonValues collect:[:v | [answer := v]]).
box image:(YesNoBox iconBitmap).
default notNil ifTrue:[
- default isInteger ifTrue:[
- box defaultButtonIndex:default
- ] ifFalse:[
- box defaultButtonIndex:(buttonValues indexOf:default)
- ].
+ box defaultButtonIndex:(default isInteger
+ ifTrue:[default]
+ ifFalse:[ buttonValues indexOf:default])
].
box label:(boxLabelOrNil ? (self classResources string:'Confirm')).
buttons := box buttons.
@@ -8681,18 +8679,20 @@
|b|
- (aKey == #Return) ifTrue:[
- (okButton notNil and:[okButton isReturnButton]) ifTrue:[
- ^ self okPressed
- ].
- (abortButton notNil and:[abortButton isReturnButton]) ifTrue:[
- ^ self abortPressed
- ].
- (buttonPanel notNil and:[(b := buttonPanel subViews detect:[:b | b isReturnButton] ifNone:nil) notNil]) ifTrue:[
- b turnOnWithAction. b turnOffWithAction.
- ^ self.
- ]
- ].
+"/ done by keyboardProcessor...
+"/ (aKey == #Return) ifTrue:[
+"/ (okButton notNil and:[okButton isReturnButton]) ifTrue:[
+"/ ^ self okPressed
+"/ ].
+"/ (abortButton notNil and:[abortButton isReturnButton]) ifTrue:[
+"/ ^ self abortPressed
+"/ ].
+"/ (buttonPanel notNil and:[(b := buttonPanel subViews detect:[:b | b isReturnButton] ifNone:nil) notNil]) ifTrue:[
+"/ b turnOnWithAction. b turnOffWithAction.
+"/ ^ self.
+"/ ]
+"/ ].
+
"/ (aKey == #Escape) ifTrue:[
"/ (abortButton notNil) ifTrue:[
"/ ^ self abortPressed
@@ -8749,7 +8749,7 @@
!DialogBox class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.276 2008-10-26 20:10:55 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.277 2008-12-17 18:59:32 cg Exp $'
! !
DialogBox initialize!