--- a/LabelAndIcon.st Fri Sep 29 20:33:50 2000 +0200
+++ b/LabelAndIcon.st Sat Sep 30 17:53:54 2000 +0200
@@ -218,7 +218,8 @@
!LabelAndIcon methodsFor:'accessing'!
beCheckMark
- self icon:(CheckToggle checkFormOn:Screen current)
+ "/ self icon:(CheckToggle checkFormOn:Screen current)
+ self icon:((CheckToggle smallCheckImageForStyle:#borderedFatcross) onDevice:Screen current)
"Created: / 21.6.1998 / 05:01:01 / cg"
"Modified: / 21.6.1998 / 05:03:23 / cg"
@@ -331,6 +332,7 @@
|y1 x1 iconHeight imageHeight stringHeight maxHeight gapY asc|
gapY := (aGC device pixelPerMillimeter x) rounded.
+ "/ gapY := 0.
asc := (aGC font onDevice:aGC device) ascent.
iconHeight := icon notNil ifTrue:[icon height] ifFalse:[0].
@@ -342,6 +344,7 @@
icon notNil ifTrue:[
y1 := y - asc + (maxHeight - iconHeight + 1 // 2).
+
icon := icon onDevice:aGC device.
(opaque and:[icon mask isNil]) ifTrue:[aGC displayOpaqueForm:icon x:x1 y:y1]
@@ -407,6 +410,7 @@
|iconHeight imageHeight stringHeight oneMillimeter|
oneMillimeter := aGC device pixelPerMillimeter x rounded.
+ "/ oneMillimeter := 0.
icon notNil ifTrue:[
iconHeight := icon height + oneMillimeter
@@ -449,5 +453,5 @@
!LabelAndIcon class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/LabelAndIcon.st,v 1.27 2000-08-21 21:54:15 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/LabelAndIcon.st,v 1.28 2000-09-30 15:53:54 cg Exp $'
! !