--- a/EditField.st	Sat Apr 02 17:11:45 2016 +0200
+++ b/EditField.st	Sat Apr 02 17:12:18 2016 +0200
@@ -1946,7 +1946,7 @@
     self computeTopMargin.
 
     DefaultBackgroundColor notNil ifTrue:[
-        bgColor := DefaultBackgroundColor onDevice:self graphicsDevice.
+        bgColor := DefaultBackgroundColor onDevice:device.
 "/        bgColor ditherForm notNil ifTrue:[
 "/            bgColor := (bgColor copy) exactOrNearestOn:self graphicsDevice
 "/        ].
@@ -2258,11 +2258,11 @@
         w := fontWidth * 20.  "space for 20 characters"
     ] ifFalse:[
         "length of current contents +  50% space to type more characters"
-        f := gc font onDevice:self graphicsDevice.
+        f := gc font onDevice:device.
         w := ((f widthOf:string) * 1.5) rounded. 
         w := w + margin + margin.
     ].
-    w := w min:(self graphicsDevice width // 2).
+    w := w min:(device width // 2).
 
     "/ h := f maxHeight + (f maxDescent * 2) + (margin * 2).
     h := fontHeight + topMargin + (margin * 2).