--- a/Button.st	Mon Mar 03 11:02:01 1997 +0100
+++ b/Button.st	Mon Mar 03 15:57:20 1997 +0100
@@ -1238,6 +1238,12 @@
     "Modified: 22.9.1995 / 17:07:46 / claus"
 !
 
+defaultable
+    "return true, if the receiver is defaultable"
+
+    ^ defaultable
+!
+
 defaultable:aBoolean
     "set/clear the defaultable attribute. If defaultable,
      the preferredExtent is computed to include any additional
@@ -1756,9 +1762,19 @@
      before)."
 
     super computeLabelOrigin.
-    (isReturnButton and:[shadowForm notNil]) ifTrue:[
-	labelOriginX := labelOriginX + hSpace + hSpace.
+    shadowForm notNil ifTrue:[
+        isReturnButton ifTrue:[
+            labelOriginX := labelOriginX + hSpace + hSpace.
+        ].
+
+        defaultable ifTrue:[
+            labelOriginX < margin ifTrue:[
+                labelOriginX := margin
+            ]
+        ]
     ]
+
+    "Modified: 3.3.1997 / 15:56:05 / cg"
 !
 
 computeLabelSize
@@ -1773,12 +1789,6 @@
 
 !Button methodsFor:'queries'!
 
-defaultable
-    "return true, if the receiver is defaultable"
-
-    ^ defaultable
-!
-
 is3D
     "return true, if the receiver is a 3D style view"
 
@@ -2094,5 +2104,5 @@
 !Button class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Button.st,v 1.79 1997-03-03 10:02:01 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Button.st,v 1.80 1997-03-03 14:57:20 cg Exp $'
 ! !