--- a/Form.st	Mon May 06 08:04:18 2002 +0200
+++ b/Form.st	Mon May 06 09:32:55 2002 +0200
@@ -990,7 +990,7 @@
     ].
     drawableId isNil ifTrue:[
         fileName notNil ifTrue:[
-            ^ (self on:Screen current) bits
+            ^ (self onDevice:Screen current) bits
         ].
         ^ nil
     ].
@@ -1473,7 +1473,7 @@
 
     |dstY newForm nRows "{ Class: SmallInteger }" |
 
-    newForm := (self class on:device)
+    newForm := (self class onDevice:device)
                                 width:width
                                 height:height
                                 depth:depth.
@@ -1496,7 +1496,7 @@
 
     |dstX newForm nCols "{ Class: SmallInteger }" |
 
-    newForm := (self class on:device)
+    newForm := (self class onDevice:device)
                                 width:width
                                 height:height
                                 depth:depth.
@@ -1546,9 +1546,7 @@
     "return a new form magnified by extent, aPoint.
      If non-integral magnify is asked for, pass the work on to 'hardMagnifiedBy:'"
 
-    |mX mY dstX dstY newForm ext 
-     factor "{ Class: SmallInteger }"
-     n      "{ Class: SmallInteger }" |
+    |mX mY newForm ext|
 
     ext := extent asPoint.
     mX := ext x.
@@ -1559,7 +1557,7 @@
         ^ self hardMagnifiedBy:ext
     ].
 
-    newForm := (self class on:device)
+    newForm := (self class onDevice:device)
                                 width:(width * mX)
                                 height:(height * mY)
                                 depth:depth.
@@ -1568,7 +1566,7 @@
     ^ newForm
 
     "
-     (ArrowButton upArrowButtonForm:#iris on:Display) magnifiedBy:(2 @ 2)
+     (ArrowButton upArrowButtonForm:#iris on:Screen current) magnifiedBy:(2 @ 2)
      (Form fromFile:'bitmaps/SBrowser.xbm') magnifiedBy:(2 @ 2)
      (Form fromFile:'bitmaps/SBrowser.xbm') magnifiedBy:(0.4 @ 0.4)
     "
@@ -2139,6 +2137,6 @@
 !Form class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Form.st,v 1.119 2002-03-04 14:23:23 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Form.st,v 1.120 2002-05-06 07:32:55 stefan Exp $'
 ! !
 Form initialize!