--- a/Button.st	Tue May 28 22:20:48 1996 +0200
+++ b/Button.st	Wed May 29 12:20:58 1996 +0200
@@ -1742,22 +1742,28 @@
 
     |extraH extraV|
 
+    preferredExtent notNil ifTrue:[
+        ^ preferredExtent
+    ].
+
     logo notNil ifTrue:[
 "
-	extraH := extraV := (onLevel abs max:offLevel abs) + ViewSpacing * 2.
+        extraH := extraV := (onLevel abs max:offLevel abs) + ViewSpacing * 2.
 "
-	extraH := extraV := (onLevel abs max:offLevel abs).
-	extraH := (extraH + hSpace * 2).
-	extraV := (extraV + vSpace * 2).
+        extraH := extraV := (onLevel abs max:offLevel abs).
+        extraH := (extraH + hSpace * 2).
+        extraV := (extraV + vSpace * 2).
 
-	self is3D ifFalse:[
-	    "add space for a frame around"
-	    extraH := extraH + 2. extraV := extraV + 2.
-	].
-	^ (labelWidth + extraH) @ (labelHeight + extraV)
+        self is3D ifFalse:[
+            "add space for a frame around"
+            extraH := extraH + 2. extraV := extraV + 2.
+        ].
+        ^ (labelWidth + extraH) @ (labelHeight + extraV)
     ].
 
     ^ super preferredExtent
+
+    "Modified: 29.5.1996 / 12:13:11 / cg"
 !
 
 specClass
@@ -1995,5 +2001,5 @@
 !Button class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Button.st,v 1.61 1996-05-28 20:09:52 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Button.st,v 1.62 1996-05-29 10:18:20 cg Exp $'
 ! !