--- a/Font.st	Fri Jul 05 18:01:22 1996 +0200
+++ b/Font.st	Fri Jul 05 18:09:14 1996 +0200
@@ -18,7 +18,7 @@
 	category:'Graphics-Support'
 !
 
-!Font class methodsFor:'documentation'!
+!Font  class methodsFor:'documentation'!
 
 copyright
 "
@@ -189,18 +189,20 @@
 "
 ! !
 
-!Font class methodsFor:'initialization'!
+!Font  class methodsFor:'initialization'!
 
 flushDeviceFontsFor:aDevice
     "unassign all fonts from their device if they are assigned
      to aDevice"
 
     Lobby do:[:aFont |
-	(aDevice isNil or:[aFont device == aDevice]) ifTrue:[
-	    aFont restored.
-	    Lobby registerChange:aFont
-	]
+        (aDevice isNil or:[aFont graphicsDevice == aDevice]) ifTrue:[
+            aFont restored.
+            Lobby registerChange:aFont
+        ]
     ]
+
+    "Modified: 5.7.1996 / 17:56:16 / cg"
 !
 
 initialize
@@ -246,7 +248,7 @@
     "Created: 15.6.1996 / 15:21:30 / cg"
 ! !
 
-!Font class methodsFor:'instance creation'!
+!Font  class methodsFor:'instance creation'!
 
 family:familyString face:faceString style:styleString size:sizeNum encoding:encodingSym
     "returns a font for given family, face, style, size and encoding. 
@@ -408,7 +410,7 @@
 
     "first look if not already there"
     Lobby do:[:aFont |
-        (aDevice == aFont device) ifTrue:[
+        (aDevice == aFont graphicsDevice) ifTrue:[
             (size == aFont size) ifTrue:[
                 (family = aFont family) ifTrue:[
                     (face = aFont face) ifTrue:[
@@ -447,7 +449,7 @@
      Font family:'foo' size:17
     "
 
-    "Modified: 23.2.1996 / 16:30:06 / cg"
+    "Modified: 5.7.1996 / 17:56:13 / cg"
 !
 
 on:aDevice ifAbsent:exceptionBlock 
@@ -1081,9 +1083,9 @@
     ^ self height
 ! !
 
-!Font class methodsFor:'documentation'!
+!Font  class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.48 1996-06-15 13:22:07 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.49 1996-07-05 16:06:05 cg Exp $'
 ! !
 Font initialize!