diff -r ca6d2f117ee8 -r 481783839f19 NeXTWorkstation.st
--- a/NeXTWorkstation.st	Wed Jul 23 14:12:30 2008 +0200
+++ b/NeXTWorkstation.st	Wed Jul 23 14:12:54 2008 +0200
@@ -11,7 +11,7 @@
 "
 
 DeviceWorkstation subclass:#NeXTWorkstation
-       instanceVariableNames:'screen
+       instanceVariableNames:'
 			      buffered
 			      knownDrawableIds'
        classVariableNames:   ''
@@ -30,7 +30,7 @@
 
 All non-monochrome stuff is untested (I only have a monochroome station)
 
-$Header: /cvs/stx/stx/libview/NeXTWorkstation.st,v 1.20 1997-05-06 12:49:50 cg Exp $
+$Header: /cvs/stx/stx/libview/NeXTWorkstation.st,v 1.21 2008-07-23 12:12:54 cg Exp $
 written spring 92 by claus
 '!
 
@@ -293,8 +293,8 @@
 
 createWindowFor:aView left:xpos top:ypos width:wwidth height:wheight
 
-    |ext minWidth minHeight maxWidth maxHeight 
-     bWidth bColor viewBg viewBgId wsuperView wsuperViewId 
+    |ext minWidth minHeight maxWidth maxHeight
+     bWidth bColor viewBg viewBgId wsuperView wsuperViewId
      wlabel wcursor wcursorId wicon wiconId windowId
      wiconView wiconViewId
      drawableId|
@@ -475,7 +475,7 @@
 freeColor:colorIndex
     "colors are never freed"
 
-    ^ self 
+    ^ self
 !
 
 colorRed:redVal green:greenVal blue:blueVal
@@ -510,7 +510,7 @@
     "change color in map at:index.
      Since NeXTs are either StaticGrey or StaticColor, do nothing here."
 
-    ^ self 
+    ^ self
 !
 
 getRedFrom:index
@@ -554,9 +554,9 @@
 
     if (__isSmallInteger(aColorId)) {
 	id = _intVal(aColorId);
-	ir = (id >> 16) & 0xFF; 
-	ig = (id >> 8) & 0xFF; 
-	ib = id & 0xFF; 
+	ir = (id >> 16) & 0xFF;
+	ig = (id >> 8) & 0xFF;
+	ib = id & 0xFF;
 	/* scale from 0 .. 255 to 0.0 .. 1.0 */
 	r = (float)ir / 255.0;
 	g = (float)ig / 255.0;
@@ -760,7 +760,7 @@
 !NeXTWorkstation methodsFor:'drawing'!
 
 displayString:aString x:x y:y in:aDrawableId with:aGCId
-    "draw a string - draw foreground only" 
+    "draw a string - draw foreground only"
 
 %{
     float fx, fy;
@@ -789,31 +789,31 @@
 !
 
 displayString:aString from:index1 to:index2 x:x y:y in:aDrawableId with:aGCId
-    "draw part of a string - draw foreground only" 
+    "draw part of a string - draw foreground only"
 
     ^ self primitiveFailed
 !
 
 displayOpaqueString:aString x:x y:y in:aDrawableId with:aGCId
-    "draw a string - draw both foreground and background" 
+    "draw a string - draw both foreground and background"
 
     ^ self primitiveFailed
 !
 
 displayOpaqueString:aString from:index1 to:index2 x:x y:y in:aDrawableId with:aGCId
-    "draw part of a string - draw both foreground and background" 
+    "draw part of a string - draw both foreground and background"
 
     ^ self primitiveFailed
 !
 
 displayPointX:x y:y in:aDrawableId with:aGCId
-    "draw a point" 
+    "draw a point"
 
     ^ self primitiveFailed
 !
 
 displayLineFromX:x0 y:y0 toX:x1 y:y1 in:aDrawableId with:aGCId
-    "draw a line" 
+    "draw a line"
 
 %{
     float fx0, fy0, fx1, fy1;
@@ -857,13 +857,13 @@
 !
 
 drawRectangleX:x y:y width:width height:height in:aDrawableId with:aGCId
-    "draw a rectangle" 
+    "draw a rectangle"
 
     ^ self primitiveFailed
 !
 
 drawPolygon:aPolygon in:aDrawableId with:aGCId
-    "draw a polygon" 
+    "draw a polygon"
 
     ^ self primitiveFailed
 !
@@ -945,7 +945,7 @@
     ^ self primitiveFailed
 !
 
-drawBits:imageBits depth:imageDepth width:imageWidth height:imageHeight 
+drawBits:imageBits depth:imageDepth width:imageWidth height:imageHeight
 		       x:srcx y:srcy
 		    into:aDrawableId x:dstx y:dsty width:w height:h with:aGCId
     "draw a bitimage which has depth id, width iw and height ih into