--- a/MenuPanel.st	Sun Nov 02 18:39:18 1997 +0100
+++ b/MenuPanel.st	Sun Nov 02 18:44:14 1997 +0100
@@ -293,7 +293,7 @@
 !
 
 updateStyleCache
-    |fg bg menuStyle|
+    |fg bg fn menuStyle|
 
     DefaultStyle := IdentityDictionary new.
 
@@ -308,14 +308,18 @@
     DefaultStyle at:#fitFirstPanel           put:(menuStyle at:     'menu.fitFirstPanel'           default:true).
     DefaultStyle at:#horizontalSpace         put:(menuStyle at:     'menu.horizontalSpace'         default:0).
     DefaultStyle at:#borderWidth             put:(menuStyle at:     'menu.borderWidth'             default:1).
-    DefaultStyle at:#font                    put:(menuStyle at:     'menu.font'                    default:nil).
+    fn := menuStyle at:'menu.font' default:nil.
+    fn isNil ifTrue:[
+        fn := menuStyle at:'selection.font' default:nil.
+    ].
+    DefaultStyle at:#font put:fn.
 
     "
      self updateStyleCache
     "
 
     "Created: / 4.7.1997 / 20:18:45 / cg"
-    "Modified: / 27.10.1997 / 01:40:52 / cg"
+    "Modified: / 1.11.1997 / 03:22:56 / cg"
 ! !
 
 !MenuPanel class methodsFor:'private'!
@@ -3093,7 +3097,7 @@
 drawSeparator
     "draw line separator
     "
-    |type l r t b x y|
+    |type l r t b x y lightColor shadowColor|
 
     type := self separatorType.
 
@@ -3104,7 +3108,10 @@
     l := layout left.
     t := layout top.
 
-    menuPanel paint:(menuPanel shadowColor).
+    shadowColor := menuPanel shadowColor.
+    lightColor := menuPanel lightColor.
+
+    menuPanel paint:shadowColor.
 
     menuPanel verticalLayout ifTrue:[
         l := l + HorizontalInset.
@@ -3114,15 +3121,15 @@
         type == #doubleLine ifTrue:[y := y - 2].
 
         menuPanel displayLineFromX:l y:y toX:r y:y.
-        menuPanel paint:(menuPanel lightColor).
+        menuPanel paint:lightColor.
         y := y + 1.
         menuPanel displayLineFromX:l y:y toX:r y:y.
 
         type == #doubleLine ifTrue:[
             y := y + 3.
-            menuPanel paint:(menuPanel shadowColor).
+            menuPanel paint:shadowColor.
             menuPanel displayLineFromX:l y:y toX:r y:y.
-            menuPanel paint:(menuPanel lightColor).
+            menuPanel paint:lightColor.
             y := y + 1.
             menuPanel displayLineFromX:l y:y toX:r y:y.
         ].
@@ -3133,20 +3140,21 @@
         type == #doubleLine ifTrue:[x := x - 2].
 
         menuPanel displayLineFromX:x y:t toX:x y:b.
-        menuPanel paint:(menuPanel lightColor).
+        menuPanel paint:lightColor.
         x := x + 1.
         menuPanel displayLineFromX:x y:t toX:x y:b.
 
         type == #doubleLine ifTrue:[
             x := x + 3.
-            menuPanel paint:(menuPanel shadowColor).
+            menuPanel paint:shadowColor.
             menuPanel displayLineFromX:x y:t toX:x y:b.
-            menuPanel paint:(menuPanel lightColor).
+            menuPanel paint:lightColor.
             x := x + 1.
             menuPanel displayLineFromX:x y:t toX:x y:b.
         ]
     ]
 
+    "Modified: / 31.10.1997 / 15:33:51 / cg"
 !
 
 drawShortcutKey
@@ -3682,6 +3690,6 @@
 !MenuPanel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.35 1997-10-29 16:48:25 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.36 1997-11-02 17:44:14 cg Exp $'
 ! !
 MenuPanel initialize!