--- a/MenuView.st	Wed Aug 18 16:39:18 1999 +0200
+++ b/MenuView.st	Wed Aug 18 16:40:54 1999 +0200
@@ -1207,16 +1207,16 @@
 font:aFont
     "adjust size for new font.
      CAVEAT: with the addition of Text objects,
-	     this method is going to be obsoleted by a textStyle
-	     method, which allows specific control over
-	     normalFont/boldFont/italicFont parameters."
-
-    super font:(aFont on:device).
+             this method is going to be obsoleted by a textStyle
+             method, which allows specific control over
+             normalFont/boldFont/italicFont parameters."
+
+    super font:(aFont onDevice:device).
     preferredExtent := nil.
     shown ifTrue:[
-	self resize
+        self resize
     ] ifFalse:[
-	needResize := true
+        needResize := true
     ]
 
     "Modified: 22.5.1996 / 12:36:37 / cg"
@@ -1780,8 +1780,8 @@
 
     super fetchDeviceResources.
 
-    checkColor notNil ifTrue:[checkColor := checkColor on:device].
-    disabledFgColor notNil ifTrue:[disabledFgColor := disabledFgColor on:device].
+    checkColor notNil ifTrue:[checkColor := checkColor onDevice:device].
+    disabledFgColor notNil ifTrue:[disabledFgColor := disabledFgColor onDevice:device].
 
     "Created: 14.1.1997 / 00:08:55 / cg"
 !
@@ -1807,76 +1807,76 @@
 "/    DefaultFont notNil ifTrue:[font := DefaultFont on:device].
 
     DefaultCheckColor notNil ifTrue:[
-	checkColor := DefaultCheckColor
+        checkColor := DefaultCheckColor
     ] ifFalse:[
-	checkColor := fgColor.
+        checkColor := fgColor.
     ].
     disabledFgColor := DefaultDisabledForegroundColor.
 
     DefaultForegroundColor notNil ifTrue:[
-	fgColor := DefaultForegroundColor on:device
+        fgColor := DefaultForegroundColor onDevice:device
     ].
     DefaultBackgroundColor notNil ifTrue:[
-	bgColor := DefaultBackgroundColor on:device
+        bgColor := DefaultBackgroundColor onDevice:device
     ].
 
     DefaultShadowColor notNil ifTrue:[
-	shadowColor := DefaultShadowColor on:device
+        shadowColor := DefaultShadowColor onDevice:device
     ].
     DefaultLightColor notNil ifTrue:[
-	lightColor := DefaultLightColor on:device
+        lightColor := DefaultLightColor onDevice:device
     ].
 
     DefaultHilightLevel notNil ifTrue:[
-	hilightLevel := DefaultHilightLevel
+        hilightLevel := DefaultHilightLevel
     ] ifFalse:[
-	hilightLevel := 0.
+        hilightLevel := 0.
     ].
     "/ hilightStyle := DefaultHilightStyle.
 
     hilightFrameColor := DefaultHilightFrameColor.
 
     styleSheet is3D ifTrue:[
-	"some 3D style menu - set hilight defaults to same"
-
-	DefaultHilightForegroundColor notNil ifTrue:[
-	    hilightFgColor := DefaultHilightForegroundColor on:device
-	] ifFalse:[
-	    hilightFgColor := fgColor.
-	].
-	DefaultHilightBackgroundColor notNil ifTrue:[
-	    hilightBgColor := DefaultHilightBackgroundColor on:device
-	] ifFalse:[
-	    hilightBgColor := bgColor.
-	].
-	DefaultLineLevel notNil ifTrue:[
-	    lineLevel := DefaultLineLevel
-	] ifFalse:[
-	    lineLevel := -1.
-	]
+        "some 3D style menu - set hilight defaults to same"
+
+        DefaultHilightForegroundColor notNil ifTrue:[
+            hilightFgColor := DefaultHilightForegroundColor onDevice:device
+        ] ifFalse:[
+            hilightFgColor := fgColor.
+        ].
+        DefaultHilightBackgroundColor notNil ifTrue:[
+            hilightBgColor := DefaultHilightBackgroundColor onDevice:device
+        ] ifFalse:[
+            hilightBgColor := bgColor.
+        ].
+        DefaultLineLevel notNil ifTrue:[
+            lineLevel := DefaultLineLevel
+        ] ifFalse:[
+            lineLevel := -1.
+        ]
     ] ifFalse:[
-	"some 2D style menu - set hilight defaults to inverse"
-	DefaultHilightForegroundColor notNil ifTrue:[
-	    hilightFgColor := DefaultHilightForegroundColor on:device
-	] ifFalse:[
-	    hilightFgColor := bgColor.
-	].
-	DefaultHilightBackgroundColor notNil ifTrue:[
-	    hilightBgColor := DefaultHilightBackgroundColor on:device
-	] ifFalse:[
-	    hilightBgColor := fgColor.
-	].
-	DefaultLineLevel notNil ifTrue:[
-	    lineLevel := DefaultLineLevel
-	] ifFalse:[
-	    lineLevel := 0.
-	]
+        "some 2D style menu - set hilight defaults to inverse"
+        DefaultHilightForegroundColor notNil ifTrue:[
+            hilightFgColor := DefaultHilightForegroundColor onDevice:device
+        ] ifFalse:[
+            hilightFgColor := bgColor.
+        ].
+        DefaultHilightBackgroundColor notNil ifTrue:[
+            hilightBgColor := DefaultHilightBackgroundColor onDevice:device
+        ] ifFalse:[
+            hilightBgColor := fgColor.
+        ].
+        DefaultLineLevel notNil ifTrue:[
+            lineLevel := DefaultLineLevel
+        ] ifFalse:[
+            lineLevel := 0.
+        ]
     ].
 
     DefaultLineInset notNil ifTrue:[
-	lineInset := DefaultLineInset
+        lineInset := DefaultLineInset
     ] ifFalse:[
-	lineInset := (device horizontalPixelPerMillimeter * 0.8) rounded.
+        lineInset := (device horizontalPixelPerMillimeter * 0.8) rounded.
     ].
 
     "
@@ -1886,12 +1886,12 @@
     style := styleSheet name.
 
     (style == #iris) ifTrue:[
-	device hasGrayscales ifTrue:[
-	    lineSpacing := 3
-	].
+        device hasGrayscales ifTrue:[
+            lineSpacing := 3
+        ].
     ].
     (style == #motif) ifTrue:[
-	lineSpacing := (2 * hilightLevel)
+        lineSpacing := (2 * hilightLevel)
     ].
 "/ stupid - these are clobbered somewhere; see initialize and recreate
 "/    hilightStyle == #openwin ifTrue:[
@@ -1904,10 +1904,10 @@
 "/        ]
 "/    ].
     (style == #st80) ifTrue:[
-	level := 0.
+        level := 0.
     ].
     DefaultViewBackground notNil ifTrue:[
-	viewBackground := DefaultViewBackground on:device
+        viewBackground := DefaultViewBackground onDevice:device
     ].
 
     "Modified: 22.1.1997 / 11:57:23 / cg"
@@ -2735,5 +2735,5 @@
 !MenuView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.123 1999-07-10 18:35:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.124 1999-08-18 14:40:54 cg Exp $'
 ! !