--- a/Image.st	Wed Aug 18 16:39:00 1999 +0200
+++ b/Image.st	Wed Aug 18 16:45:20 1999 +0200
@@ -1362,7 +1362,7 @@
 
     img := self fromFile:aFileName.
     img notNil ifTrue:[
-        ^ img on:aDevice
+        ^ img onDevice:aDevice
     ].
     ^ nil
 
@@ -1409,7 +1409,7 @@
     img := img magnifiedBy:(mag @ mag).
     aDevice notNil ifTrue:[
         "should not happen ..."
-        ^ img on:aDevice
+        ^ img onDevice:aDevice
     ].
     ^ img
 
@@ -1901,7 +1901,7 @@
      For ST-80 compatibility 
      (ST/X uses Image for both device- and nonDevice-images)"
 
-    ^ self on:Screen current
+    ^ self onDevice:Screen current
 
     "Modified: 23.4.1996 / 11:10:32 / cg"
 !
@@ -1911,7 +1911,7 @@
      For ST-80 compatibility 
      (ST/X uses Image for both device- and nonDevice-images)"
 
-    ^ self on:Screen current
+    ^ self onDevice:Screen current
 
     "Modified: 23.4.1996 / 11:10:32 / cg"
     "Created: 27.1.1997 / 15:49:08 / cg"
@@ -3600,7 +3600,7 @@
     ((aDevice == device) and:[deviceForm notNil]) ifTrue:[^ deviceForm].
 
     mask notNil ifTrue:[
-        mask := mask on:aDevice
+        mask := mask onDevice:aDevice
     ].
 
     (aDevice depth == 1
@@ -4981,7 +4981,7 @@
         "oops, I am already accociated to another device
          - need a copy ...
         "
-        ^ self copy on:aDevice
+        ^ self copy onDevice:aDevice
     ].
     deviceForm := self asFormOn:aDevice.
     maskedPixelsAre0 := nil.
@@ -5119,7 +5119,7 @@
     1 to:nColors do:[:i |
         aColor := colorMap at:i.
         aColor notNil ifTrue:[
-            aColor := aColor on:aDevice.
+            aColor := aColor onDevice:aDevice.
             colorMap at:i put:aColor.
             id := aColor colorId.
             id isNil ifTrue:[
@@ -5149,15 +5149,15 @@
     f colorMap:colorMap. 
     f initGC.
     aDevice 
-	drawBits:wideBits 
-	depth:8 
-	padding:8
-	width:width height:height
+        drawBits:wideBits 
+        depth:8 
+        padding:8
+        width:width height:height
         x:0 y:0
         into:(f id) 
-	x:0 y:0 
-	width:width height:height 
-	with:(f gcId).
+        x:0 y:0 
+        width:width height:height 
+        with:(f gcId).
     ^ f
 
     "Modified: 19.10.1997 / 05:19:44 / cg"
@@ -11662,6 +11662,6 @@
 !Image class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Image.st,v 1.274 1999-07-13 21:23:24 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Image.st,v 1.275 1999-08-18 14:45:20 cg Exp $'
 ! !
 Image initialize!