--- a/Form.st	Wed May 30 13:41:43 2007 +0200
+++ b/Form.st	Wed May 30 13:42:10 2007 +0200
@@ -263,7 +263,7 @@
     "create a new form, take dimensions from ext, bits from data."
 
     self obsoleteMethodWarning:'use #extent:fromArray:onDevice:'.
-    ^ self width:(ext x) height:(ext y) fromArray:data on:aDevice
+    ^ self width:(ext x) height:(ext y) fromArray:data onDevice:aDevice
 
     "Created: / 10-04-1997 / 15:34:34 / cg"
     "Modified: / 27-05-2007 / 12:41:57 / cg"
@@ -353,6 +353,7 @@
 !
 
 width:w height:h fromArray:anArray on:aDevice
+    <resource: #obsolete>
     "create a new form on device, aDevice and
      initialize the pixels from anArray"
 
@@ -689,12 +690,12 @@
     |f|
 
     ((aDevice == Display) and:[DarkGreyForm notNil]) ifTrue:[
-	^ DarkGreyForm
+        ^ DarkGreyForm
     ].
 
-    f := self width:8 height:4 fromArray:(self darkGreyFormBits) on:aDevice.
+    f := self width:8 height:4 fromArray:(self darkGreyFormBits) onDevice:aDevice.
     (aDevice == Display) ifTrue:[
-	DarkGreyForm := f
+        DarkGreyForm := f
     ].
     ^ f
 !
@@ -715,12 +716,12 @@
     |f|
 
     ((aDevice == Display) and:[LightGreyForm notNil]) ifTrue:[
-	^ LightGreyForm
+        ^ LightGreyForm
     ].
 
-    f := self width:8 height:4 fromArray:(self lightGreyFormBits) on:aDevice.
+    f := self width:8 height:4 fromArray:(self lightGreyFormBits) onDevice:aDevice.
     (aDevice == Display) ifTrue:[
-	LightGreyForm := f
+        LightGreyForm := f
     ].
     ^ f
 !
@@ -731,12 +732,12 @@
     |f|
 
     ((aDevice == Display) and:[GreyForm notNil]) ifTrue:[
-	^ GreyForm
+        ^ GreyForm
     ].
 
-    f := self width:8 height:4 fromArray:(self greyFormBits) on:aDevice.
+    f := self width:8 height:4 fromArray:(self greyFormBits) onDevice:aDevice.
     (aDevice == Display) ifTrue:[
-	GreyForm := f
+        GreyForm := f
     ].
     ^ f
 !
@@ -747,12 +748,12 @@
     |f|
 
     ((aDevice == Display) and:[VeryDarkGreyForm notNil]) ifTrue:[
-	^ VeryDarkGreyForm
+        ^ VeryDarkGreyForm
     ].
 
-    f := self width:8 height:4 fromArray:(self veryDarkGreyFormBits) on:aDevice.
+    f := self width:8 height:4 fromArray:(self veryDarkGreyFormBits) onDevice:aDevice.
     (aDevice == Display) ifTrue:[
-	VeryDarkGreyForm := f
+        VeryDarkGreyForm := f
     ].
     ^ f
 !
@@ -763,12 +764,12 @@
     |f|
 
     ((aDevice == Display) and:[VeryLightGreyForm notNil]) ifTrue:[
-	^ VeryLightGreyForm
+        ^ VeryLightGreyForm
     ].
 
-    f := self width:8 height:4 fromArray:(self veryLightGreyFormBits) on:aDevice.
+    f := self width:8 height:4 fromArray:(self veryLightGreyFormBits) onDevice:aDevice.
     (aDevice == Display) ifTrue:[
-	VeryLightGreyForm := f
+        VeryLightGreyForm := f
     ].
     ^ f
 ! !
@@ -1359,7 +1360,7 @@
 
     data notNil ifTrue:[
         "/ 'Form [info]: create from data' printCR.
-        ^ self class width:width height:height fromArray:data on:aDevice
+        ^ self class width:width height:height fromArray:data onDevice:aDevice
     ].
     fileName notNil ifTrue:[
         "/ 'Form [info]: create from file' printCR.
@@ -2187,7 +2188,7 @@
 !Form class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Form.st,v 1.138 2007-05-29 17:32:37 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Form.st,v 1.139 2007-05-30 11:42:10 stefan Exp $'
 ! !
 
 Form initialize!