--- a/MenuPanel.st Thu Sep 28 04:18:12 2000 +0200
+++ b/MenuPanel.st Thu Sep 28 08:39:38 2000 +0200
@@ -645,17 +645,17 @@
|deviceImages image|
anImage device == aDevice ifTrue:[
- ^ anImage
- ].
-
- Images isNil ifTrue:[ Images := IdentityDictionary new ].
+ ^ anImage
+ ].
+
+ Images isNil ifTrue:[ Images := WeakIdentityDictionary new ].
(deviceImages := Images at:aDevice ifAbsent:nil) isNil ifTrue:[
- Images at:aDevice put:(deviceImages := Dictionary new)
+ Images at:aDevice put:(deviceImages := Dictionary new)
].
(image := deviceImages at:anImage ifAbsent:nil) notNil ifTrue:[
- ^ image
+ ^ image
].
image := anImage copy onDevice:aDevice.
@@ -672,21 +672,21 @@
"
|deviceImages image|
- LigthenedImages isNil ifTrue:[ LigthenedImages := IdentityDictionary new ].
+ LigthenedImages isNil ifTrue:[ LigthenedImages := WeakIdentityDictionary new ].
(deviceImages := LigthenedImages at:aDevice ifAbsent:nil) isNil ifTrue:[
- LigthenedImages at:aDevice put:(deviceImages := Dictionary new)
+ LigthenedImages at:aDevice put:(deviceImages := Dictionary new)
].
(image := deviceImages at:anImage ifAbsent:nil) notNil ifTrue:[
- ^ image
+ ^ image
].
((anImage respondsTo:#colorMap) and:[anImage colorMap notNil]) ifTrue:[
- image := anImage copy lightened onDevice:aDevice.
- image clearMaskedPixels.
+ image := anImage copy lightened onDevice:aDevice.
+ image clearMaskedPixels.
] ifFalse:[
- image := self image:anImage onDevice:aDevice
+ image := self image:anImage onDevice:aDevice
].
deviceImages at:anImage put:image.
^ image
@@ -6231,6 +6231,6 @@
!MenuPanel class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.247 2000-09-18 09:55:45 ca Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.248 2000-09-28 06:39:38 stefan Exp $'
! !
MenuPanel initialize!