--- a/Image.st	Tue Jun 06 06:11:58 1995 +0200
+++ b/Image.st	Tue Jun 27 04:21:46 1995 +0200
@@ -28,7 +28,7 @@
 COPYRIGHT (c) 1991 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Image.st,v 1.32 1995-06-06 04:07:22 claus Exp $
+$Header: /cvs/stx/stx/libview/Image.st,v 1.33 1995-06-27 02:19:16 claus Exp $
 '!
 
 !Image class methodsFor:'documentation'!
@@ -49,7 +49,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Image.st,v 1.32 1995-06-06 04:07:22 claus Exp $
+$Header: /cvs/stx/stx/libview/Image.st,v 1.33 1995-06-27 02:19:16 claus Exp $
 "
 !
 
@@ -254,7 +254,10 @@
 fromScreen
     "return an image of the full screen"
 
-    ^ self fromScreen:(0@0 corner:(Display width@Display height))
+    |display|
+
+    display := Screen current.
+    ^ self fromScreen:(0@0 corner:(display width @ display height))
 !
 
 fromUser
@@ -278,7 +281,7 @@
 fromScreen:aRectangle
     "return an image of a part of the screen"
 
-    ^ self fromScreen:aRectangle on:Display
+    ^ self fromScreen:aRectangle on:Screen current 
 
     "Image fromScreen:(0@0 corner:100@100)"
 !
@@ -331,7 +334,7 @@
      out the file format itself (by the extension and by contents)
      and lets the appropriate reader read the file."
 
-    |image name nm inStream|
+    |image name nm inStream suffixLen|
 
     "
      before trying each reader, check if file is readable
@@ -353,12 +356,17 @@
     "
     nm := name.
     (name endsWith:'.Z') ifTrue:[
-	nm := name copyTo:(name size - 2)
+	suffixLen := 2
     ] ifFalse:[
 	(name endsWith:'.gz') ifTrue:[
-	    nm := name copyTo:(name size - 3)
+	    suffixLen := 3
+	] ifFalse:[
+	    suffixLen := 0
 	]
     ].
+    suffixLen ~~ 0 ifTrue:[
+	nm := name copyWithoutLast:suffixLen
+    ].
 
     "
      ask the corresponding readerclass first
@@ -1205,7 +1213,7 @@
 fromScreen:aRectangle
     "read an image from the display screen"
 
-    ^ self fromScreen:aRectangle on:Display
+    ^ self fromScreen:aRectangle on:Screen current
 !
 
 fromScreen:aRectangle on:aDevice
@@ -1602,7 +1610,7 @@
 asCachedImage
     "for ST-80 compatibility"
 
-    ^ self on:Display
+    ^ self on:Screen current
 ! !
 
 !Image methodsFor:'converting rgb images'!