--- a/ViewStyle.st	Tue Jun 06 06:11:58 1995 +0200
+++ b/ViewStyle.st	Tue Jun 27 04:21:46 1995 +0200
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1994 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/ViewStyle.st,v 1.3 1994-10-28 03:18:29 claus Exp $
+$Header: /cvs/stx/stx/libview/ViewStyle.st,v 1.4 1995-06-27 02:20:33 claus Exp $
 '!
 
 !ViewStyle class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/ViewStyle.st,v 1.3 1994-10-28 03:18:29 claus Exp $
+$Header: /cvs/stx/stx/libview/ViewStyle.st,v 1.4 1995-06-27 02:20:33 claus Exp $
 "
 !
 
@@ -61,19 +61,18 @@
 fromFile:aFileName
     "get the preferences definitions from a file"
 
-    |prefs|
+    |prefs failed nm|
 
     prefs := self new.
     (aFileName endsWith:'.style') ifTrue:[
-	prefs at:#name put:(aFileName copyTo:aFileName size - 6)
+	nm := aFileName copyWithoutLast:6
     ] ifFalse:[
-	prefs at:#name put:aFileName
+	nm := aFileName
     ].
-    (prefs readFromFile:aFileName directory:'resources') isNil ifTrue:[
-	prefs at:#fileReadFailed put:true
-    ] ifFalse:[
-	prefs at:#fileReadFailed put:false 
-    ].
+    prefs at:#name put:nm. 
+
+    failed := (prefs readFromFile:aFileName directory:'resources') isNil.
+    prefs at:#fileReadFailed put:failed. 
     ^ prefs
 
     "
@@ -93,7 +92,7 @@
 
     aResource := self at:aKey default:default.
     aResource notNil ifTrue:[
-	^ aResource on:Display
+	^ aResource on:Screen current
     ].
     ^ nil
 !