--- a/ComboView.st	Mon Mar 03 11:02:40 1997 +0100
+++ b/ComboView.st	Fri Mar 07 16:43:43 1997 +0100
@@ -232,8 +232,14 @@
     styleSheet is3D ifTrue:[
         halfSpacing := ViewSpacing // 2.
         leftInset := rightInset := prefWidth + halfSpacing.
-        pullDownButton rightInset:halfSpacing.
-        field leftInset:halfSpacing
+        styleSheet name == #win95 ifTrue:[
+            self level:-1.
+            field level:0.
+            field rightInset:margin.
+        ] ifFalse:[
+            pullDownButton rightInset:halfSpacing.
+            field leftInset:halfSpacing
+        ].
     ] ifFalse:[
         leftInset := prefWidth + pullDownButton borderWidth.
         rightInset := prefWidth.
@@ -255,7 +261,7 @@
     "
 
     "Created: 28.2.1996 / 15:03:17 / cg"
-    "Modified: 27.2.1997 / 15:22:47 / cg"
+    "Modified: 7.3.1997 / 16:40:29 / cg"
 ! !
 
 !ComboView methodsFor:'message delegation'!
@@ -307,7 +313,7 @@
 preferredExtent
     "compute & return the boxes preferredExtent from the components' preferrences"
 
-    |fieldPref buttonPref m menuPrefX|
+    |fieldPref buttonPref m menuPrefX w h|
 
     "/ If I have an explicit preferredExtent ..
 
@@ -329,10 +335,14 @@
     fieldPref := field preferredExtent.
     buttonPref := pullDownButton preferredExtent.
 
-    ^ (((fieldPref x max:menuPrefX) max:50) + buttonPref x) @ (fieldPref y max:buttonPref y)
+    w := ((fieldPref x max:menuPrefX) max:50) + buttonPref x.
+    w := w + margin + margin.
+    h := fieldPref y max:buttonPref y.
+    h := h + margin + margin.
+    ^ w @ h
 
     "Created: 28.2.1996 / 15:03:17 / cg"
-    "Modified: 27.2.1997 / 15:32:52 / cg"
+    "Modified: 7.3.1997 / 16:42:15 / cg"
 ! !
 
 !ComboView methodsFor:'user interaction'!
@@ -379,5 +389,5 @@
 !ComboView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/ComboView.st,v 1.23 1997-02-28 18:54:49 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ComboView.st,v 1.24 1997-03-07 15:43:43 cg Exp $'
 ! !