--- a/LinkButton.st	Sat Apr 02 11:06:24 2016 +0100
+++ b/LinkButton.st	Sun Apr 03 17:14:58 2016 +0100
@@ -177,7 +177,7 @@
     self borderWidth: 0.
     DefaultLinkColor notNil ifTrue:[
         |color|
-        self paint:(color := DefaultLinkColor onDevice:self graphicsDevice).
+        self paint:(color := DefaultLinkColor onDevice:device).
         self foreground:color.
     ].
     enteredFgColor := nil.
@@ -327,7 +327,7 @@
 
     leftX := labelOriginX.
     labelsAndActions isNil ifTrue:[
-        w := (self font widthOf:logo on:self graphicsDevice).
+        w := (self font widthOf:logo on:device).
         rightX := leftX + w-1.
         aFourArgBlock 
             value:logo
@@ -341,7 +341,7 @@
         |lbl wEach|
 
         lbl := assoc key.
-        wEach := (self font widthOf:lbl on:self graphicsDevice).
+        wEach := (self font widthOf:lbl on:device).
         rightX := leftX + wEach-1.
         aFourArgBlock 
             value:assoc key