--- a/TextView.st	Sun Apr 03 17:13:01 2016 +0100
+++ b/TextView.st	Sun Apr 03 19:25:10 2016 +0100
@@ -1202,8 +1202,8 @@
      The default is defined by the styleSheet;
      typically black-on-green for color displays and white-on-black for b&w displays."
 
-    selectionFgColor := color1 onDevice:self graphicsDevice.
-    selectionBgColor := color2 onDevice:self graphicsDevice.
+    selectionFgColor := color1 onDevice:device.
+    selectionBgColor := color2 onDevice:device.
     self hasSelection ifTrue:[
         self invalidate
     ]
@@ -1306,8 +1306,8 @@
                     (coding := f encoding) notNil
                     and:[pref match:coding]].
 
-    self graphicsDevice flushListOfAvailableFonts.
-    matchingFonts := self graphicsDevice listOfAvailableFonts select:filter.
+    device flushListOfAvailableFonts.
+    matchingFonts := device listOfAvailableFonts select:filter.
     matchingFamilyFonts := matchingFonts select:[:f | f family = gc font family].
     matchingFamilyFaceFonts := matchingFamilyFonts select:[:f | f face = gc font face].
     matchingFamilyFaceStyleFonts := matchingFamilyFaceFonts select:[:f | f style = gc font style].
@@ -1929,8 +1929,8 @@
 
 mapped
     super mapped.
-    selectionFgColor := selectionFgColor onDevice:self graphicsDevice.
-    selectionBgColor := selectionBgColor onDevice:self graphicsDevice.
+    selectionFgColor := selectionFgColor onDevice:device.
+    selectionBgColor := selectionBgColor onDevice:device.
 !
 
 quadClickX:x y:y
@@ -1958,8 +1958,8 @@
 
     super fetchDeviceResources.
 
-    selectionFgColor notNil ifTrue:[selectionFgColor := selectionFgColor onDevice:self graphicsDevice].
-    selectionBgColor notNil ifTrue:[selectionBgColor := selectionBgColor onDevice:self graphicsDevice].
+    selectionFgColor notNil ifTrue:[selectionFgColor := selectionFgColor onDevice:device].
+    selectionBgColor notNil ifTrue:[selectionBgColor := selectionBgColor onDevice:device].
 
     "Created: 14.1.1997 / 00:14:33 / cg"
 !
@@ -1974,13 +1974,13 @@
     selectionFgColor isNil ifTrue:[selectionFgColor := bgColor].
     selectionBgColor := DefaultSelectionBackgroundColor.
     selectionBgColor isNil ifTrue:[
-	self graphicsDevice hasColors ifTrue:[
+	device hasColors ifTrue:[
             DefaultSelectionForegroundColor isNil ifTrue:[
                 selectionFgColor := fgColor
             ].
             selectionBgColor := Color green
         ] ifFalse:[
-	    self graphicsDevice hasGrayscales ifTrue:[
+	    device hasGrayscales ifTrue:[
                 DefaultSelectionForegroundColor isNil ifTrue:[
                     selectionFgColor := fgColor
                 ].
@@ -5044,10 +5044,10 @@
 setPrimarySelection
     "can be redefined for notification or special actions"
 
-    self graphicsDevice notNil ifTrue:[
+    device notNil ifTrue:[
         "On X11, be nice and set the PRIMARY selection.
          (#setPrimaryText:ownerView: is void in DeviceWorkstation)"
-	self graphicsDevice setPrimaryText: self selectionAsString ownerView: self.
+	device setPrimaryText: self selectionAsString ownerView: self.
     ].
 
     "Created: / 17-04-2012 / 20:59:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"