PullDownMenu.st
changeset 1678 2c63b6f17997
parent 1621 fa41bbb0d4f2
child 1865 f2f2d6c93324
--- a/PullDownMenu.st	Fri Sep 18 14:46:43 1998 +0200
+++ b/PullDownMenu.st	Fri Sep 18 17:27:32 1998 +0200
@@ -1436,67 +1436,71 @@
 
     showSeparatingLines := DefaultSeparatingLines. "/ false.
     DefaultViewBackground notNil ifTrue:[
-	viewBackground := DefaultViewBackground on:device
+        viewBackground := DefaultViewBackground on:device
     ].
 
     DefaultForegroundColor notNil ifTrue:[
-	fgColor := DefaultForegroundColor
+        fgColor := DefaultForegroundColor
     ] ifFalse:[
-	fgColor := Black.
+        fgColor := Black.
     ].
     DefaultBackgroundColor notNil ifTrue:[
-	bgColor := DefaultBackgroundColor
+        bgColor := DefaultBackgroundColor
     ] ifFalse:[
-	bgColor := viewBackground.
+        bgColor := viewBackground.
     ].
     onLevel := DefaultHilightLevel.
     offLevel := DefaultLevel.
 
     self is3D ifTrue:[
-	device hasColors ifTrue:[
-	    activeFgColor := Color name:'yellow'
-	] ifFalse:[
-	    activeFgColor := White
-	].
-	device hasGrayscales ifTrue:[
-	    activeBgColor := bgColor.
-	] ifFalse:[
-	    activeBgColor := fgColor.
-	].
-	topMargin := 2.
+        device hasColors ifTrue:[
+            activeFgColor := Color name:'yellow'
+        ] ifFalse:[
+            activeFgColor := White
+        ].
+        device hasGrayscales ifTrue:[
+            activeBgColor := bgColor.
+        ] ifFalse:[
+            activeBgColor := fgColor.
+        ].
+        topMargin := 2.
 
-	style := styleSheet name.
-	((style == #iris) or:[style == #motif]) ifTrue:[
-	    self level:2.
-	    onLevel := 2.
-	    offLevel := 0.
-	    activeFgColor := fgColor
-	]
+        style := styleSheet name.
+        ((style == #iris) or:[style == #motif]) ifTrue:[
+            self level:2.
+            onLevel := 2.
+            offLevel := 0.
+            activeFgColor := fgColor
+        ] ifFalse:[
+            style == #win95 ifTrue:[
+                self level:1
+            ]
+        ]
     ] ifFalse:[
-	activeFgColor := bgColor.
-	activeBgColor := fgColor.
-	topMargin := 0
+        activeFgColor := bgColor.
+        activeBgColor := fgColor.
+        topMargin := 0
     ].
 
     edgeStyle := DefaultEdgeStyle.
     toggleMode := DefaultToggleMode.
 
     DefaultHilightForegroundColor notNil ifTrue:[
-	activeFgColor := DefaultHilightForegroundColor
+        activeFgColor := DefaultHilightForegroundColor
     ].
     DefaultHilightBackgroundColor notNil ifTrue:[
-	activeBgColor := DefaultHilightBackgroundColor
+        activeBgColor := DefaultHilightBackgroundColor
     ].
     DefaultShadowColor notNil ifTrue:[
-	shadowColor := DefaultShadowColor
+        shadowColor := DefaultShadowColor
     ].
     DefaultLightColor notNil ifTrue:[
-	lightColor := DefaultLightColor
+        lightColor := DefaultLightColor
     ].
 
     raiseTopWhenActivated := styleSheet at:'pullDownMenuRaiseTop' default:true.
 
-    "Modified: 17.1.1997 / 23:22:13 / cg"
+    "Modified: / 15.9.1998 / 22:58:42 / cg"
 !
 
 initialize
@@ -1782,5 +1786,5 @@
 !PullDownMenu class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.83 1998-07-28 14:08:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.84 1998-09-18 15:27:32 cg Exp $'
 ! !