--- a/LinkButton.st	Tue Feb 18 15:47:39 2014 +0100
+++ b/LinkButton.st	Tue Feb 18 15:48:35 2014 +0100
@@ -38,7 +38,6 @@
         , ' '
         , ('World' actionForAll:[ Transcript showCR:'World Clicked'])).
 
-    l foregroundColor:Color blue.
     v open
                                                                     [exEnd]
 
@@ -128,7 +127,9 @@
 
     level := enterLevel := leaveLevel := onLevel := offLevel := 0.
     DefaultLinkColor notNil ifTrue:[
-        foreground := DefaultLinkColor onDevice:device.
+        |color|
+        self paint:(color := DefaultLinkColor onDevice:self graphicsDevice).
+        self foreground:color.
     ].
     enteredFgColor := nil. "/ Color blue.
 
@@ -265,7 +266,7 @@
 
     leftX := labelOriginX.
     labelsAndActions isNil ifTrue:[
-        w := (self font widthOf:logo on:device).
+        w := (self font widthOf:logo on:self graphicsDevice).
         rightX := leftX + w-1.
         aFourArgBlock 
             value:logo
@@ -279,7 +280,7 @@
         |lbl wEach|
 
         lbl := assoc key.
-        wEach := (self font widthOf:lbl on:device).
+        wEach := (self font widthOf:lbl on:self graphicsDevice).
         rightX := leftX + wEach-1.
         aFourArgBlock 
             value:assoc key
@@ -295,5 +296,6 @@
 !LinkButton class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/LinkButton.st,v 1.8 2011-09-07 02:47:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/LinkButton.st,v 1.9 2014-02-18 14:48:35 stefan Exp $'
 ! !
+