--- a/TabWidget.st	Sat Apr 02 16:33:18 2016 +0200
+++ b/TabWidget.st	Sat Apr 02 17:06:23 2016 +0200
@@ -9,10 +9,9 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-
+"{ Package: 'stx:libwidg2' }"
 
-
-"{ Package: 'stx:libwidg2' }"
+"{ NameSpace: Smalltalk }"
 
 Object subclass:#TabWidget
 	instanceVariableNames:'model tabView label disabledLabel printableLabel anchor extent
@@ -128,19 +127,19 @@
 computeColorsOn:aView style:aStyle
     "set colors dependent on selection color
     "
-    |device unselectedColor selectedColor avgSelectedColor avgUnSelectedColor|
+    |viewsDevice unselectedColor selectedColor avgSelectedColor avgUnSelectedColor|
 
-    device := aView device.
+    viewsDevice := aView device.
 
     selectedColor   := aView viewBackground.
     unselectedColor := selectedColor lightened.
     avgSelectedColor := selectedColor averageColorIn:(0@0 corner:7@7).
     avgUnSelectedColor := unselectedColor averageColorIn:(0@0 corner:7@7).
 
-    aStyle at:#shadowColorSelected put:(avgSelectedColor darkened onDevice:device).
-    aStyle at:#lightColorSelected put:(avgSelectedColor lightened onDevice:device).
-    aStyle at:#shadowColorUnselected put:(avgUnSelectedColor darkened onDevice:device).
-    aStyle at:#lightColorUnselected put:(avgUnSelectedColor lightened onDevice:device).
+    aStyle at:#shadowColorSelected put:(avgSelectedColor darkened onDevice:viewsDevice).
+    aStyle at:#lightColorSelected put:(avgSelectedColor lightened onDevice:viewsDevice).
+    aStyle at:#shadowColorUnselected put:(avgUnSelectedColor darkened onDevice:viewsDevice).
+    aStyle at:#lightColorUnselected put:(avgUnSelectedColor lightened onDevice:viewsDevice).
 
     aStyle at:#unselectedColor    put:unselectedColor.
     aStyle at:#selectedColor      put:selectedColor.
@@ -152,11 +151,11 @@
 computeColorsOn:aView style:aStyle selectionColor:aSelectedColor
     "set colors dependent on selection color
     "
-    |device unselectedColor selectedColor avgSelectedColor avgUnSelectedColor|
+    |viewsDevice unselectedColor selectedColor avgSelectedColor avgUnSelectedColor|
 
     "/ CG: this seems to be no longer needed ...
 
-    device := aView device.
+    viewsDevice := aView device.
 
     unselectedColor := aView viewBackground.
     selectedColor   := unselectedColor lightened.
@@ -164,10 +163,10 @@
     avgSelectedColor := selectedColor averageColorIn:(0@0 corner:7@7).
     avgUnSelectedColor := unselectedColor averageColorIn:(0@0 corner:7@7).
 
-    aStyle at:#shadowColorSelected put:(avgSelectedColor darkened onDevice:device).
-    aStyle at:#lightColorSelected put:(avgSelectedColor lightened onDevice:device).
-    aStyle at:#shadowColorUnselected put:(avgUnSelectedColor darkened onDevice:device).
-    aStyle at:#lightColorUnselected put:(avgUnSelectedColor lightened onDevice:device).
+    aStyle at:#shadowColorSelected put:(avgSelectedColor darkened onDevice:viewsDevice).
+    aStyle at:#lightColorSelected put:(avgSelectedColor lightened onDevice:viewsDevice).
+    aStyle at:#shadowColorUnselected put:(avgUnSelectedColor darkened onDevice:viewsDevice).
+    aStyle at:#lightColorUnselected put:(avgUnSelectedColor lightened onDevice:viewsDevice).
 
     aStyle at:#unselectedColor    put:unselectedColor.
     aStyle at:#selectedColor      put:selectedColor.
@@ -1086,5 +1085,6 @@
 !TabWidget class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/TabWidget.st,v 1.23 2003-10-07 13:40:32 stefan Exp $'
+    ^ '$Header$'
 ! !
+