--- a/TabWidget.st	Sat Apr 24 16:41:55 1999 +0200
+++ b/TabWidget.st	Sat Apr 24 18:48:23 1999 +0200
@@ -124,22 +124,17 @@
 computeColorsOn:aView style:aStyle
     "set colors dependent on selection color
     "
-    |unselectedColor selectedColor|
+    |unselectedColor selectedColor avgSelectedColor avgUnSelectedColor|
 
     selectedColor   := aView viewBackground.
     unselectedColor := selectedColor lightened.
-
-    aStyle at:#shadowColorSelected
-         put:((selectedColor averageColorIn:(0@0 corner:7@7)) darkened  on:aView device).
+    avgSelectedColor := selectedColor averageColorIn:(0@0 corner:7@7).
+    avgUnSelectedColor := unselectedColor averageColorIn:(0@0 corner:7@7).
 
-    aStyle at:#lightColorSelected
-         put:((selectedColor averageColorIn:(0@0 corner:7@7)) lightened on:aView device).
-
-    aStyle at:#shadowColorUnselected
-         put:((unselectedColor averageColorIn:(0@0 corner:7@7)) darkened  on:aView device).
-
-    aStyle at:#lightColorUnselected
-         put:((unselectedColor averageColorIn:(0@0 corner:7@7)) lightened on:aView device).
+    aStyle at:#shadowColorSelected put:(avgSelectedColor darkened on:aView device).
+    aStyle at:#lightColorSelected put:(avgSelectedColor lightened on:aView device).
+    aStyle at:#shadowColorUnselected put:(avgUnSelectedColor darkened on:aView device).
+    aStyle at:#lightColorUnselected put:(avgUnSelectedColor lightened on:aView device).
 
     aStyle at:#unselectedColor    put:unselectedColor.
     aStyle at:#selectedColor      put:selectedColor.
@@ -149,22 +144,20 @@
 computeColorsOn:aView style:aStyle selectionColor:aSelectedColor
     "set colors dependent on selection color
     "
-    |unselectedColor selectedColor|
+    |unselectedColor selectedColor avgSelectedColor avgUnSelectedColor|
+
+    "/ CG: this seems to be no longer needed ...
 
     unselectedColor := aView viewBackground.
     selectedColor   := unselectedColor lightened.
 
-    aStyle at:#shadowColorSelected
-         put:((selectedColor averageColorIn:(0@0 corner:7@7)) darkened  on:aView device).
-
-    aStyle at:#lightColorSelected
-         put:((selectedColor averageColorIn:(0@0 corner:7@7)) lightened on:aView device).
+    avgSelectedColor := selectedColor averageColorIn:(0@0 corner:7@7).
+    avgUnSelectedColor := unselectedColor averageColorIn:(0@0 corner:7@7).
 
-    aStyle at:#shadowColorUnselected
-         put:((unselectedColor averageColorIn:(0@0 corner:7@7)) darkened  on:aView device).
-
-    aStyle at:#lightColorUnselected
-         put:((unselectedColor averageColorIn:(0@0 corner:7@7)) lightened on:aView device).
+    aStyle at:#shadowColorSelected put:(avgSelectedColor darkened on:aView device).
+    aStyle at:#lightColorSelected put:(avgSelectedColor lightened on:aView device).
+    aStyle at:#shadowColorUnselected put:(avgUnSelectedColor darkened on:aView device).
+    aStyle at:#lightColorUnselected put:(avgUnSelectedColor lightened on:aView device).
 
     aStyle at:#unselectedColor    put:unselectedColor.
     aStyle at:#selectedColor      put:selectedColor.
@@ -1082,5 +1075,5 @@
 !TabWidget class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/TabWidget.st,v 1.17 1999-02-26 13:50:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/TabWidget.st,v 1.18 1999-04-24 16:48:23 cg Exp $'
 ! !