--- a/DragAndDropManager.st Sun Jun 09 16:47:23 2002 +0200
+++ b/DragAndDropManager.st Mon Jun 10 17:12:24 2002 +0200
@@ -1025,44 +1025,44 @@
displayObjectFor:anObject on:aDevice
"converts an object to a display object
"
- |obj icon s1 s2|
+ |obj s1 s2|
obj := (anObject respondsTo:#displayObject) ifTrue:[anObject displayObject]
- ifFalse:[anObject].
+ ifFalse:[anObject].
obj isString ifTrue:[
- ^ obj
+ ^ obj
].
obj messageNotUnderstoodSignal handle:[:ex|] do:[
- obj := obj on:aDevice
+ obj := obj onDevice:aDevice
].
obj isImage ifTrue:[
- ^ obj clearMaskedPixels
+ ^ obj clearMaskedPixels
].
obj class == LabelAndIcon ifTrue:[
- obj image notNil ifTrue:[obj image clearMaskedPixels].
- obj icon notNil ifTrue:[obj icon clearMaskedPixels].
+ obj image notNil ifTrue:[obj image clearMaskedPixels].
+ obj icon notNil ifTrue:[obj icon clearMaskedPixels].
^ obj
].
(obj class == MultiColListEntry) ifFalse:[
- ^ obj
+ ^ obj
].
s1 := obj colAt:1.
s2 := obj colAt:2.
s1 isImage ifTrue:[
- s2 isImage ifTrue:[ ^ self displayObjectFor:(LabelAndIcon form:s1 image:s2) on:aDevice ].
- s2 isString ifTrue:[ ^ self displayObjectFor:(LabelAndIcon icon:s1 string:s2) on:aDevice ].
- ^ (s1 on:aDevice) clearMaskedPixels
+ s2 isImage ifTrue:[ ^ self displayObjectFor:(LabelAndIcon form:s1 image:s2) on:aDevice ].
+ s2 isString ifTrue:[ ^ self displayObjectFor:(LabelAndIcon icon:s1 string:s2) on:aDevice ].
+ ^ (s1 on:aDevice) clearMaskedPixels
].
s2 isImage ifTrue:[
- s1 isString ifTrue:[ ^ self displayObjectFor:(LabelAndIcon icon:s2 string:s1) on:aDevice ].
- ^ (s2 on:aDevice) clearMaskedPixels
+ s1 isString ifTrue:[ ^ self displayObjectFor:(LabelAndIcon icon:s2 string:s1) on:aDevice ].
+ ^ (s2 on:aDevice) clearMaskedPixels
].
s1 isString ifTrue:[^ s1].
@@ -1393,6 +1393,6 @@
!DragAndDropManager class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/DragAndDropManager.st,v 1.36 2002-02-11 09:29:58 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/DragAndDropManager.st,v 1.37 2002-06-10 15:12:24 stefan Exp $'
! !
DragAndDropManager initialize!