--- a/Font.st	Wed Jul 20 17:07:38 2016 +0200
+++ b/Font.st	Wed Jul 20 18:26:01 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1992 by Claus Gittinger
 	      All Rights Reserved
@@ -11,6 +9,8 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
+'From Smalltalk/X, Version:7.1.0.0 on 20-07-2016 at 15:21:49'                   !
+
 "{ Package: 'stx:libview' }"
 
 "{ NameSpace: Smalltalk }"
@@ -307,6 +307,14 @@
     "Created: 28.5.1996 / 18:39:53 / cg"
 ! !
 
+!Font methodsFor:'binary storage'!
+
+readBinaryContentsFrom: stream manager: manager
+    "tell the newly restored Font about restoration"
+
+    super readBinaryContentsFrom: stream manager: manager.
+    self restored
+! !
 
 !Font methodsFor:'converting'!
 
@@ -742,6 +750,17 @@
     ^ device fontResolutionOf:f.
 !
 
+installInDeviceForGCId:aGCId
+    "install the font for aGCId"
+
+    (device isNil or:[fontId isNil]) ifTrue:[
+        "this should not happen, since #onDevice tries replacement fonts"
+        Logger error:'no device font for: %1' with:self.
+        ^ nil.
+    ].
+    device setFont:fontId in:aGCId.
+!
+
 releaseFromDevice
     "I am no longer available on the device"