--- a/SimpleView.st	Wed Jul 24 13:57:40 1996 +0200
+++ b/SimpleView.st	Wed Jul 24 20:14:45 1996 +0200
@@ -939,9 +939,10 @@
         self == SimpleView ifFalse:[
             f := self superclass defaultFont.
         ] ifTrue:[
-"/            f := super defaultFont
+            f := super defaultFont
         ].
     ].
+
     f notNil ifTrue:[
 	DefaultFont := f.
 	f := f on:Display.
@@ -957,9 +958,14 @@
 defaultFont:aFont
     "set the default font used for drawing"
 
+    |f|
+
     DefaultFont := aFont.
     aFont notNil ifTrue:[
-        DefaultFont := aFont on:Display
+        f := aFont on:Display.
+	f notNil ifTrue:[
+	    DefaultFont := f.
+	]
     ]
 
     "Modified: 18.3.1996 / 12:56:20 / cg"
@@ -6482,6 +6488,6 @@
 !SimpleView  class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.133 1996-07-23 18:17:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.134 1996-07-24 18:14:45 cg Exp $'
 ! !
 SimpleView initialize!