--- a/Button.st	Tue Jul 22 16:15:08 2008 +0200
+++ b/Button.st	Tue Jul 22 22:25:57 2008 +0200
@@ -2179,11 +2179,14 @@
 
     DefaultFocusHighlightStyle == #win95 ifTrue:[
         self hasFocus ifTrue:[
-            self drawWin95FocusFrame
+            self windowGroup focusCameByTab ifTrue:[
+                self drawWin95FocusFrame
+            ]
         ].
     ]
 
     "Modified: / 18.9.1998 / 16:55:38 / cg"
+
 !
 
 redraw
@@ -2315,5 +2318,5 @@
 !Button class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Button.st,v 1.138 2008-05-19 10:42:25 sr Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Button.st,v 1.139 2008-07-22 20:25:57 cg Exp $'
 ! !