--- a/RButton.st	Mon Nov 03 16:17:59 1997 +0100
+++ b/RButton.st	Mon Nov 03 16:24:30 1997 +0100
@@ -11,8 +11,8 @@
 "
 
 Toggle subclass:#RadioButton
-	instanceVariableNames:''
-	classVariableNames:''
+	instanceVariableNames:'buttonStyle buttonOnLevel buttonOffLevel'
+	classVariableNames:'DefaultButtonStyle DefaultActiveLevel DefaultPassiveLevel'
 	poolDictionaries:''
 	category:'Views-Interactors'
 !
@@ -141,14 +141,309 @@
 "
 ! !
 
+!RadioButton class methodsFor:'defaults'!
+
+motifCheckBotForm
+    ^ Form 
+        width:15 
+        height:15 
+        fromArray:#[2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00001110
+                    2r01110000 2r00011100
+                    2r00111000 2r00111000
+                    2r00011100 2r01110000
+                    2r00001110 2r11100000
+                    2r00000111 2r11000000
+                    2r00000011 2r10000000
+                    2r00000001 2r00000000
+                   ]
+
+    "Created: / 3.11.1997 / 12:06:45 / cg"
+    "Modified: / 3.11.1997 / 12:10:50 / cg"
+!
+
+motifCheckTopForm
+    ^ Form 
+        width:15 
+        height:15 
+        fromArray:#[2r00000001 2r00000000
+                    2r00000011 2r10000000
+                    2r00000111 2r11000000
+                    2r00001110 2r11100000
+                    2r00011100 2r01110000
+                    2r00111000 2r00111000
+                    2r01110000 2r00011100
+                    2r11100000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                   ]
+
+    "Created: / 3.11.1997 / 12:06:45 / cg"
+    "Modified: / 3.11.1997 / 12:11:03 / cg"
+!
+
+round3DCheckBotForm
+    ^ Form 
+        width:15 
+        height:15 
+        fromArray:#[2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00001100
+                    2r00000000 2r00000110
+                    2r00000000 2r00000110
+                    2r00000000 2r00000110
+                    2r00000000 2r00001100
+                    2r00000000 2r00001100
+                    2r00110000 2r00011000
+                    2r00111100 2r01111000
+                    2r00001111 2r11100000
+                    2r00000011 2r10000000
+                   ]
+
+    "Modified: / 3.11.1997 / 13:32:17 / cg"
+    "Created: / 3.11.1997 / 14:29:37 / cg"
+!
+
+round3DCheckTopForm
+    ^ Form 
+        width:15 
+        height:15 
+        fromArray:#[2r00000011 2r10000000
+                    2r00001111 2r11100000
+                    2r00111100 2r01111000
+                    2r00110000 2r00011000
+                    2r01100000 2r00001100
+                    2r01100000 2r00001100
+                    2r11000000 2r00000000
+                    2r11000000 2r00000000
+                    2r11000000 2r00000000
+                    2r01100000 2r00000000
+                    2r01100000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                   ]
+
+    "Modified: / 3.11.1997 / 13:31:49 / cg"
+    "Created: / 3.11.1997 / 14:29:45 / cg"
+!
+
+roundOffForm
+    ^ Form 
+        width:15 
+        height:15 
+        fromArray:#[2r00000011 2r10000000
+                    2r00001111 2r11100000
+                    2r00111100 2r01111000
+                    2r00110000 2r00011000
+                    2r01100000 2r00001100
+                    2r01100000 2r00001100
+                    2r11000000 2r00000110
+                    2r11000000 2r00000110
+                    2r11000000 2r00000110
+                    2r01100000 2r00001100
+                    2r01100000 2r00001100
+                    2r00110000 2r00011000
+                    2r00111100 2r01111000
+                    2r00001111 2r11100000
+                    2r00000011 2r10000000
+                   ]
+
+    "Created: / 3.11.1997 / 12:41:13 / cg"
+    "Modified: / 3.11.1997 / 13:25:03 / cg"
+!
+
+roundOnForm
+    ^ Form 
+        width:15 
+        height:15 
+        fromArray:#[2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000011 2r10000000
+                    2r00000111 2r11000000
+                    2r00001111 2r11100000
+                    2r00001111 2r11100000
+                    2r00001111 2r11100000
+                    2r00000111 2r11000000
+                    2r00000011 2r10000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                   ]
+
+    "Created: / 3.11.1997 / 12:41:17 / cg"
+    "Modified: / 3.11.1997 / 14:10:59 / cg"
+!
+
+updateStyleCache
+    |l|
+
+    DefaultButtonStyle := StyleSheet at:'radioButton.style'.
+    l := -1.
+    DefaultButtonStyle == #round2D ifTrue:[l := 0].
+    DefaultActiveLevel := StyleSheet at:'radioButton.activeLevel' default:l.
+    DefaultButtonStyle == #motif ifTrue:[l := 1].
+    DefaultPassiveLevel := StyleSheet at:'radioButton.passivelLevel' default:l.
+
+    "
+     self updateStyleCache
+    "
+
+    "Modified: / 3.11.1997 / 14:20:21 / cg"
+! !
+
+!RadioButton methodsFor:'drawing'!
+
+drawToggleImage
+    "drawing of the radio image is done here."
+
+    |x y clrTop clrBot img1 img2 img imgOn threeD lvl|
+
+    buttonStyle isNil ifTrue:[
+        ^ super drawToggleImage
+    ].
+
+    threeD := true.
+    buttonStyle == #motif ifTrue:[
+        img1 := self class motifCheckTopForm onDevice:device.
+        img2 := self class motifCheckBotForm onDevice:device.
+    ] ifFalse:[
+        buttonStyle == #round3D ifTrue:[
+            img1 := self class round3DCheckTopForm onDevice:device.
+            img2 := self class round3DCheckBotForm onDevice:device.
+            buttonOnLevel == buttonOffLevel ifTrue:[
+                controller pressed ifTrue:[
+                    imgOn := self class roundOnForm onDevice:device.
+                ]
+            ].
+        ] ifFalse:[
+            img1 := self class roundOffForm onDevice:device.
+            controller pressed ifTrue:[
+                imgOn := self class roundOnForm onDevice:device.
+            ].
+            threeD := false.
+        ]
+    ].
+
+    x := hSpace + margin.
+    y := (height - img1 height) // 2.
+
+    threeD ifFalse:[
+        self paint:fgColor.
+        self displayForm:img1 x:x y:y.
+        controller pressed ifTrue:[
+            self paint:activeFgColor.
+            self displayForm:imgOn x:x y:y
+        ]
+    ] ifTrue:[
+        controller pressed ifTrue:[
+            lvl := buttonOnLevel
+        ] ifFalse:[
+            lvl := buttonOffLevel.
+        ].
+        lvl < 0 ifTrue:[
+            clrTop := shadowColor.
+            clrBot := lightColor.
+        ] ifFalse:[
+            clrTop := lightColor.
+            clrBot := shadowColor.
+        ].
+        self paint:clrTop.
+        self displayForm:img1 x:x y:y.
+        self paint:clrBot.
+        self displayForm:img2 x:x y:y.
+
+        controller pressed ifTrue:[
+            imgOn notNil ifTrue:[
+                self paint:fgColor.
+                self displayForm:imgOn x:x y:y
+            ]
+        ]
+    ]
+
+    "Created: / 3.11.1997 / 12:16:30 / cg"
+    "Modified: / 3.11.1997 / 14:46:41 / cg"
+! !
+
 !RadioButton methodsFor:'initialization'!
 
 defaultControllerClass
     ^ RadioButtonController
+!
+
+initStyle
+    buttonStyle := DefaultButtonStyle.
+    super initStyle.
+
+    buttonStyle isNil ifTrue:[
+        showLamp := styleSheet at:'radioButton.showLamp' default:showLamp.
+        ^ self
+    ].
+
+    showLamp := true.
+    buttonOnLevel := DefaultActiveLevel.
+    buttonOffLevel := DefaultPassiveLevel.
+
+    onLevel := offLevel := 0.
+    self level:0.
+
+    (buttonStyle == #motif 
+    or:[buttonStyle == #round3D]) ifTrue:[
+        activeBgColor := bgColor. 
+        activeFgColor := fgColor.
+    ] ifFalse:[
+        buttonStyle == #round2D ifTrue:[
+            activeFgColor := fgColor.
+            activeBgColor := bgColor.
+        ]
+    ]
+
+    "Modified: / 3.11.1997 / 14:38:11 / cg"
+! !
+
+!RadioButton methodsFor:'private'!
+
+lampImageHeight
+    ^ 15
+
+    "Created: / 3.11.1997 / 14:27:27 / cg"
+!
+
+lampImageWidth
+    ^ 15
+
+    "Created: / 3.11.1997 / 14:27:23 / cg"
+! !
+
+!RadioButton methodsFor:'queries'!
+
+is3D
+    buttonStyle == #round2D ifTrue:[^ false.].
+    ^ super is3D
+
+    "Created: / 3.11.1997 / 14:39:36 / cg"
 ! !
 
 !RadioButton class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Attic/RButton.st,v 1.14 1997-03-01 12:53:37 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/RButton.st,v 1.15 1997-11-03 15:24:30 cg Exp $'
 ! !

--- a/RadioButton.st	Mon Nov 03 16:17:59 1997 +0100
+++ b/RadioButton.st	Mon Nov 03 16:24:30 1997 +0100
@@ -11,8 +11,8 @@
 "
 
 Toggle subclass:#RadioButton
-	instanceVariableNames:''
-	classVariableNames:''
+	instanceVariableNames:'buttonStyle buttonOnLevel buttonOffLevel'
+	classVariableNames:'DefaultButtonStyle DefaultActiveLevel DefaultPassiveLevel'
 	poolDictionaries:''
 	category:'Views-Interactors'
 !
@@ -141,14 +141,309 @@
 "
 ! !
 
+!RadioButton class methodsFor:'defaults'!
+
+motifCheckBotForm
+    ^ Form 
+        width:15 
+        height:15 
+        fromArray:#[2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00001110
+                    2r01110000 2r00011100
+                    2r00111000 2r00111000
+                    2r00011100 2r01110000
+                    2r00001110 2r11100000
+                    2r00000111 2r11000000
+                    2r00000011 2r10000000
+                    2r00000001 2r00000000
+                   ]
+
+    "Created: / 3.11.1997 / 12:06:45 / cg"
+    "Modified: / 3.11.1997 / 12:10:50 / cg"
+!
+
+motifCheckTopForm
+    ^ Form 
+        width:15 
+        height:15 
+        fromArray:#[2r00000001 2r00000000
+                    2r00000011 2r10000000
+                    2r00000111 2r11000000
+                    2r00001110 2r11100000
+                    2r00011100 2r01110000
+                    2r00111000 2r00111000
+                    2r01110000 2r00011100
+                    2r11100000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                   ]
+
+    "Created: / 3.11.1997 / 12:06:45 / cg"
+    "Modified: / 3.11.1997 / 12:11:03 / cg"
+!
+
+round3DCheckBotForm
+    ^ Form 
+        width:15 
+        height:15 
+        fromArray:#[2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00001100
+                    2r00000000 2r00000110
+                    2r00000000 2r00000110
+                    2r00000000 2r00000110
+                    2r00000000 2r00001100
+                    2r00000000 2r00001100
+                    2r00110000 2r00011000
+                    2r00111100 2r01111000
+                    2r00001111 2r11100000
+                    2r00000011 2r10000000
+                   ]
+
+    "Modified: / 3.11.1997 / 13:32:17 / cg"
+    "Created: / 3.11.1997 / 14:29:37 / cg"
+!
+
+round3DCheckTopForm
+    ^ Form 
+        width:15 
+        height:15 
+        fromArray:#[2r00000011 2r10000000
+                    2r00001111 2r11100000
+                    2r00111100 2r01111000
+                    2r00110000 2r00011000
+                    2r01100000 2r00001100
+                    2r01100000 2r00001100
+                    2r11000000 2r00000000
+                    2r11000000 2r00000000
+                    2r11000000 2r00000000
+                    2r01100000 2r00000000
+                    2r01100000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                   ]
+
+    "Modified: / 3.11.1997 / 13:31:49 / cg"
+    "Created: / 3.11.1997 / 14:29:45 / cg"
+!
+
+roundOffForm
+    ^ Form 
+        width:15 
+        height:15 
+        fromArray:#[2r00000011 2r10000000
+                    2r00001111 2r11100000
+                    2r00111100 2r01111000
+                    2r00110000 2r00011000
+                    2r01100000 2r00001100
+                    2r01100000 2r00001100
+                    2r11000000 2r00000110
+                    2r11000000 2r00000110
+                    2r11000000 2r00000110
+                    2r01100000 2r00001100
+                    2r01100000 2r00001100
+                    2r00110000 2r00011000
+                    2r00111100 2r01111000
+                    2r00001111 2r11100000
+                    2r00000011 2r10000000
+                   ]
+
+    "Created: / 3.11.1997 / 12:41:13 / cg"
+    "Modified: / 3.11.1997 / 13:25:03 / cg"
+!
+
+roundOnForm
+    ^ Form 
+        width:15 
+        height:15 
+        fromArray:#[2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000011 2r10000000
+                    2r00000111 2r11000000
+                    2r00001111 2r11100000
+                    2r00001111 2r11100000
+                    2r00001111 2r11100000
+                    2r00000111 2r11000000
+                    2r00000011 2r10000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                    2r00000000 2r00000000
+                   ]
+
+    "Created: / 3.11.1997 / 12:41:17 / cg"
+    "Modified: / 3.11.1997 / 14:10:59 / cg"
+!
+
+updateStyleCache
+    |l|
+
+    DefaultButtonStyle := StyleSheet at:'radioButton.style'.
+    l := -1.
+    DefaultButtonStyle == #round2D ifTrue:[l := 0].
+    DefaultActiveLevel := StyleSheet at:'radioButton.activeLevel' default:l.
+    DefaultButtonStyle == #motif ifTrue:[l := 1].
+    DefaultPassiveLevel := StyleSheet at:'radioButton.passivelLevel' default:l.
+
+    "
+     self updateStyleCache
+    "
+
+    "Modified: / 3.11.1997 / 14:20:21 / cg"
+! !
+
+!RadioButton methodsFor:'drawing'!
+
+drawToggleImage
+    "drawing of the radio image is done here."
+
+    |x y clrTop clrBot img1 img2 img imgOn threeD lvl|
+
+    buttonStyle isNil ifTrue:[
+        ^ super drawToggleImage
+    ].
+
+    threeD := true.
+    buttonStyle == #motif ifTrue:[
+        img1 := self class motifCheckTopForm onDevice:device.
+        img2 := self class motifCheckBotForm onDevice:device.
+    ] ifFalse:[
+        buttonStyle == #round3D ifTrue:[
+            img1 := self class round3DCheckTopForm onDevice:device.
+            img2 := self class round3DCheckBotForm onDevice:device.
+            buttonOnLevel == buttonOffLevel ifTrue:[
+                controller pressed ifTrue:[
+                    imgOn := self class roundOnForm onDevice:device.
+                ]
+            ].
+        ] ifFalse:[
+            img1 := self class roundOffForm onDevice:device.
+            controller pressed ifTrue:[
+                imgOn := self class roundOnForm onDevice:device.
+            ].
+            threeD := false.
+        ]
+    ].
+
+    x := hSpace + margin.
+    y := (height - img1 height) // 2.
+
+    threeD ifFalse:[
+        self paint:fgColor.
+        self displayForm:img1 x:x y:y.
+        controller pressed ifTrue:[
+            self paint:activeFgColor.
+            self displayForm:imgOn x:x y:y
+        ]
+    ] ifTrue:[
+        controller pressed ifTrue:[
+            lvl := buttonOnLevel
+        ] ifFalse:[
+            lvl := buttonOffLevel.
+        ].
+        lvl < 0 ifTrue:[
+            clrTop := shadowColor.
+            clrBot := lightColor.
+        ] ifFalse:[
+            clrTop := lightColor.
+            clrBot := shadowColor.
+        ].
+        self paint:clrTop.
+        self displayForm:img1 x:x y:y.
+        self paint:clrBot.
+        self displayForm:img2 x:x y:y.
+
+        controller pressed ifTrue:[
+            imgOn notNil ifTrue:[
+                self paint:fgColor.
+                self displayForm:imgOn x:x y:y
+            ]
+        ]
+    ]
+
+    "Created: / 3.11.1997 / 12:16:30 / cg"
+    "Modified: / 3.11.1997 / 14:46:41 / cg"
+! !
+
 !RadioButton methodsFor:'initialization'!
 
 defaultControllerClass
     ^ RadioButtonController
+!
+
+initStyle
+    buttonStyle := DefaultButtonStyle.
+    super initStyle.
+
+    buttonStyle isNil ifTrue:[
+        showLamp := styleSheet at:'radioButton.showLamp' default:showLamp.
+        ^ self
+    ].
+
+    showLamp := true.
+    buttonOnLevel := DefaultActiveLevel.
+    buttonOffLevel := DefaultPassiveLevel.
+
+    onLevel := offLevel := 0.
+    self level:0.
+
+    (buttonStyle == #motif 
+    or:[buttonStyle == #round3D]) ifTrue:[
+        activeBgColor := bgColor. 
+        activeFgColor := fgColor.
+    ] ifFalse:[
+        buttonStyle == #round2D ifTrue:[
+            activeFgColor := fgColor.
+            activeBgColor := bgColor.
+        ]
+    ]
+
+    "Modified: / 3.11.1997 / 14:38:11 / cg"
+! !
+
+!RadioButton methodsFor:'private'!
+
+lampImageHeight
+    ^ 15
+
+    "Created: / 3.11.1997 / 14:27:27 / cg"
+!
+
+lampImageWidth
+    ^ 15
+
+    "Created: / 3.11.1997 / 14:27:23 / cg"
+! !
+
+!RadioButton methodsFor:'queries'!
+
+is3D
+    buttonStyle == #round2D ifTrue:[^ false.].
+    ^ super is3D
+
+    "Created: / 3.11.1997 / 14:39:36 / cg"
 ! !
 
 !RadioButton class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/RadioButton.st,v 1.14 1997-03-01 12:53:37 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/RadioButton.st,v 1.15 1997-11-03 15:24:30 cg Exp $'
 ! !