--- a/ToolApplicationModel.st	Fri Mar 20 19:12:11 1998 +0100
+++ b/ToolApplicationModel.st	Fri Mar 20 21:18:57 1998 +0100
@@ -1244,28 +1244,30 @@
 updateFonts
     "take defined fonts from the settings and set them to the corresponding views"
 
-    |labelFont buttonFont editFont listFont treeListFont|
+    |settings labelFont buttonFont editFont listFont treeListFont|
+
+    settings     := self class settings.
 
-    labelFont    := self class settings at: #'Label Font'     ifAbsent: nil.
-    buttonFont   := self class settings at: #'Button Font'    ifAbsent: nil.
-    editFont     := self class settings at: #'Edit Font'      ifAbsent: nil.
-    listFont     := self class settings at: #'List Font'      ifAbsent: nil.
-    treeListFont := self class settings at: #'Tree List Font' ifAbsent: nil.
+    labelFont    := settings at: #'Label Font'     ifAbsent: nil.
+    buttonFont   := settings at: #'Button Font'    ifAbsent: nil.
+    editFont     := settings at: #'Edit Font'      ifAbsent: nil.
+    listFont     := settings at: #'List Font'      ifAbsent: nil.
+    treeListFont := settings at: #'Tree List Font' ifAbsent: nil.
 
     builder namedComponents do: 
-    [:aView|    
+    [:aView|
         aView allSubViewsDo: 
         [:aSubView|
             (labelFont notNil and: [aSubView font ~= labelFont and: [(aSubView class == Label) or: [(aSubView isKindOf: Toggle) or: [aSubView class = FramedBox or: [aSubView class == NoteBookView]]]]])
-                ifTrue: [aSubView font: labelFont. aSubView realize].
+                ifTrue: [aSubView font: labelFont; fixSize; sizeChanged:nil; invalidate].
             (buttonFont notNil and: [aSubView font ~= buttonFont and: [aSubView class == Button or: [aSubView class == PopUpList]]])
-                ifTrue: [aSubView sizeFixed: true. aSubView font: buttonFont. aSubView realize].
+                ifTrue: [aSubView label isString ifTrue: [aSubView sizeFixed: true. aSubView font: buttonFont; invalidate]].
             (editFont  notNil and: [aSubView font ~= editFont and: [aSubView isKindOf: TextView]])
-                ifTrue: [aSubView font: editFont. aSubView realize].
+                ifTrue: [aSubView font: editFont; invalidate].
             (listFont notNil and: [aSubView font ~= listFont and: [aSubView class = SelectionInListView or: [aSubView class = DataSetView]]])
-                ifTrue: [aSubView font: listFont. aSubView realize].
+                ifTrue: [aSubView font: listFont. aSubView invalidate].
             (treeListFont notNil and: [aSubView font ~= treeListFont and: [aSubView isKindOf: SelectionInTreeView]])
-                ifTrue: [aSubView font: treeListFont. aSubView realize].
+                ifTrue: [aSubView font: treeListFont; invalidate].
         ]
     ]
 ! !
@@ -1337,5 +1339,5 @@
 !ToolApplicationModel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/ToolApplicationModel.st,v 1.47 1998-03-20 16:01:40 tz Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/ToolApplicationModel.st,v 1.48 1998-03-20 20:18:57 tz Exp $'
 ! !