--- a/Button.st	Sat Jan 08 18:31:31 1994 +0100
+++ b/Button.st	Thu Jan 13 01:18:51 1994 +0100
@@ -32,7 +32,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
               All Rights Reserved
 
-$Header: /cvs/stx/stx/libwidg/Button.st,v 1.5 1994-01-08 17:22:47 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Button.st,v 1.6 1994-01-13 00:14:41 claus Exp $
 
 written spring/summer 89 by claus
 '!
@@ -239,6 +239,8 @@
     enteredFgColor := enteredBgColor := nil.
     halfShadowColor := shadowColor := nil.
 
+    shadowColor := Black.
+
     (style == #next) ifTrue:[
         softEdge := true.
         onLevel := 1.
@@ -249,7 +251,6 @@
             enteredFgColor := fgColor.
             enteredBgColor := Color lightGrey.
             halfShadowColor := Color darkGrey.
-            shadowColor := Black.
         ]
     ] ifFalse:[
         (style == #openwin) ifTrue:[
@@ -267,7 +268,6 @@
                     fgColor := Black.
                     bgColor := Grey.
                     halfShadowColor := Color darkGrey.
-                    shadowColor := Black.
                     activeFgColor := fgColor.
                     activeBgColor := bgColor
                 ]
@@ -277,7 +277,6 @@
                     onLevel := -1.
                     softEdge := true.
                     halfShadowColor := Color darkGrey.
-                    shadowColor := Black.
                     disabledFgColor := Color darkGrey.
                     enteredFgColor := fgColor.
                     device hasGreyscales ifTrue:[
@@ -620,7 +619,7 @@
         self is3D ifFalse:[
             self paint:fg on:bg.
             self background:bg.
-            self drawOpaqueForm:shadowForm x:x y:y
+            self displayOpaqueForm:shadowForm x:x y:y
         ] ifTrue:[
             ((formShadowColor colorId notNil)
              and:[(formLightColor colorId notNil)
@@ -634,11 +633,11 @@
             ].
             shadowForm notNil ifTrue:[
                 self foreground:sColor.
-                self drawForm:shadowForm x:x y:y.
+                self displayForm:shadowForm x:x y:y.
             ].
             lightForm notNil ifTrue:[
                 self foreground:lColor.
-                self drawForm:lightForm x:x y:y.
+                self displayForm:lightForm x:x y:y.
             ].
             self foreground:fg background:bg function:#copy
         ]
@@ -674,7 +673,7 @@
                         self drawWith:bgColor and:fgColor.
                         (logo isKindOf:Form) ifFalse:[
                             self paint:bg.
-                            self drawRectangleX:0 y:0 width:width height:height
+                            self displayRectangleX:0 y:0 width:width height:height
                         ]
                     ] ifFalse:[     
                         super redraw