--- a/Form.st	Mon May 10 17:02:04 2004 +0200
+++ b/Form.st	Mon May 10 17:05:00 2004 +0200
@@ -536,10 +536,8 @@
 
 extent:ext depth:d fromArray:data offset:offs
 
-    d ~~ 1 ifTrue:[self halt:'unsupported depth'].       
-    ^self width:(ext x) height:(ext y) offset:offs fromArray:data
-
-
+    d ~~ 1 ifTrue:[self error:'unsupported depth' mayProceed:true].       
+    ^ self width:(ext x) height:(ext y) offset:offs fromArray:data
 ! !
 
 !Form class methodsFor:'cleanup'!
@@ -650,7 +648,7 @@
      Please do no longer use this, since it will not work
      correctly in multi-display applications (creates the form on the
      default Display).
-     Use #fromFile:on: and pass the devive as argument."
+     Use #fromFile:on: and pass the device as argument."
 
     <resource:#obsolete>
 
@@ -1385,7 +1383,7 @@
     ].
     fileName notNil ifTrue:[
         "/ 'Form [info]: create from file' printCR.
-        ^ self class fromFile:fileName on:aDevice
+        ^ (Image fromFile:fileName) asFormOn:aDevice
     ].
     'Form [warning]: no bit data in #onDevice: - returning a black form.' infoPrintCR.
     ^ (self class width:width height:height on:aDevice) clear
@@ -2146,7 +2144,7 @@
 !Form class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Form.st,v 1.127 2003-08-18 12:13:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Form.st,v 1.128 2004-05-10 15:05:00 stefan Exp $'
 ! !
 
 Form initialize!