--- a/FontPanel.st	Sat Apr 02 17:06:58 2016 +0200
+++ b/FontPanel.st	Sat Apr 02 17:08:19 2016 +0200
@@ -540,7 +540,7 @@
 
     super initialize.
 
-    showFontNameLabel := self graphicsDevice isWindowsPlatform not.
+    showFontNameLabel := device isWindowsPlatform not.
     sizeUnit := #pt.
 
     mm := ViewSpacing.
@@ -609,7 +609,7 @@
         encodingLabel beInvisible
     ].
 
-    self graphicsDevice supportsXftFonts ifTrue:[
+    device supportsXftFonts ifTrue:[
         self xftFontsOnlyHolder value: (UserPreferences current useXftFontsOnly).
         xftCheckBox := CheckBox label:(resources string:'XFT Fonts Only') in:box1.
         xftCheckBox model:xftFontsOnlyHolder.
@@ -721,7 +721,7 @@
     |availableEncodings listPresentedToUser|
 
     listOfEncodings := OrderedCollection new.
-    self graphicsDevice isWindowsPlatform ifTrue:[
+    device isWindowsPlatform ifTrue:[
         listOfEncodings
             addAll:
                 #(
@@ -741,7 +741,7 @@
     ].
 
     availableEncodings := Set new.
-    self graphicsDevice listOfAvailableFonts do:[:f | availableEncodings add:(f encoding ? '?')].
+    device listOfAvailableFonts do:[:f | availableEncodings add:(f encoding ? '?')].
     availableEncodings := availableEncodings asSortedCollection.
     listOfEncodings addAll:availableEncodings.
 
@@ -871,7 +871,7 @@
             fontShown := fontShown asSize:sz
         ].
     ].
-    ^ fontShown onDevice:self graphicsDevice
+    ^ fontShown onDevice:device
 
 "/    fontShown :=
 "/        ((Screen current supportsXFTFonts and:[selectedFont isXftFont "self xftFontsOnlyHolder value" ])
@@ -946,7 +946,7 @@
     [
         UserPreferences current useXftFontsOnly:(xftFontsOnlyHolder value).            
         UserPreferences current useXFontsOnly:false.            
-        allFonts := self graphicsDevice listOfAvailableFonts.
+        allFonts := device listOfAvailableFonts.
     ] ensure:[
         UserPreferences current useXftFontsOnly:sav_useXftFontsOnly.            
         UserPreferences current useXFontsOnly:sav_useXFontsOnly.            
@@ -1065,7 +1065,7 @@
     self withWaitCursorDo:[
         font := self fontForPreview.
         font notNil ifTrue:[
-            deviceFont := font onDevice:self graphicsDevice.
+            deviceFont := font onDevice:device.
             enc := deviceFont encoding.
             enc isNil ifTrue:[enc := #'fontspecific'].
 
@@ -1564,7 +1564,7 @@
 flushListOfAvailableFonts
     self withWaitCursorDo:[
         "this may take some time, especially with X11 XFT fonts"
-        self graphicsDevice 
+        device 
             flushListOfAvailableFonts;
             listOfAvailableFonts.
 
@@ -1589,7 +1589,7 @@
     okAction notNil ifTrue:[
         currentFamily notNil ifTrue:[
             okAction value:
-                (((self graphicsDevice supportsXftFonts and:[self xftFontsOnlyHolder value])
+                (((device supportsXftFonts and:[self xftFontsOnlyHolder value])
                         ifTrue:[XftFontDescription]
                         ifFalse:[FontDescription])
                       family:currentFamily