--- a/SimpleView.st	Mon Mar 18 12:34:01 1996 +0100
+++ b/SimpleView.st	Mon Mar 18 12:57:47 1996 +0100
@@ -902,7 +902,12 @@
 defaultFont:aFont
     "set the default font used for drawing"
 
-    DefaultFont := aFont on:Display
+    DefaultFont := aFont.
+    aFont notNil ifTrue:[
+        DefaultFont := aFont on:Display
+    ]
+
+    "Modified: 18.3.1996 / 12:56:20 / cg"
 !
 
 defaultStyle
@@ -973,15 +978,15 @@
 
     StyleSheet := ViewStyle fromFile:(DefaultStyle , '.style').
     StyleSheet fileReadFailed ifTrue:[
-	('***** WARNING: no styleSheet for ' , DefaultStyle , '-style.') errorPrintNL.
-	DefaultStyle ~~ #normal ifTrue:[
-	    DefaultStyle := #normal.
-	    StyleSheet := ViewStyle fromFile:(DefaultStyle , '.style').
+        ('***** WARNING: no styleSheet for ' , DefaultStyle , '-style.') errorPrintNL.
+        DefaultStyle ~~ #normal ifTrue:[
+            DefaultStyle := #normal.
+            StyleSheet := ViewStyle fromFile:(DefaultStyle , '.style').
         
-	    StyleSheet fileReadFailed ifTrue:[
-		'***** WARNING: not even a styleSheet for normal-style (using defaults).' errorPrintNL.
-	    ]
-	]
+            StyleSheet fileReadFailed ifTrue:[
+                '***** WARNING: not even a styleSheet for normal-style (using defaults).' errorPrintNL.
+            ]
+        ]
     ].
 
     "
@@ -991,12 +996,17 @@
     self changed:#style.
     SimpleView updateStyleCache.
     SimpleView allSubclassesDo:[:aClass |
-	(aClass class implements:#updateStyleCache) ifTrue:[aClass updateStyleCache].
+        aClass defaultFont:nil.
+        (aClass class implements:#updateStyleCache) ifTrue:[
+            aClass updateStyleCache
+        ].
     ]
 
     "
      View updateAllStyleCaches
     "
+
+    "Modified: 18.3.1996 / 12:56:26 / cg"
 !
 
 updateStyleCache
@@ -1068,6 +1078,8 @@
             DefaultFont := Font family:'courier' face:'medium' style:'roman' size:12.
         ].
         DefaultFont := DefaultFont on:Display.
+    ] ifFalse:[
+        DefaultFont := nil
     ].
 
     DefaultViewBackgroundColor isNil ifTrue:[
@@ -1075,7 +1087,7 @@
         DefaultViewBackgroundColor := White
     ].
 
-    "Modified: 18.3.1996 / 12:30:01 / cg"
+    "Modified: 18.3.1996 / 12:52:12 / cg"
 !
 
 viewSpacing
@@ -6158,6 +6170,6 @@
 !SimpleView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.72 1996-03-18 11:34:01 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.73 1996-03-18 11:57:47 cg Exp $'
 ! !
 SimpleView initialize!