--- a/FontPanel.st	Sun Apr 03 17:13:01 2016 +0100
+++ b/FontPanel.st	Sun Apr 03 19:25:10 2016 +0100
@@ -886,7 +886,7 @@
 "/    
 "/    fontShown notNil ifTrue:[^ fontShown].
 "/
-"/    allFonts := self graphicsDevice 
+"/    allFonts := device 
 "/                    fontsInFamily:(currentFamily ? '*')
 "/                    face:(currentFace ? '*')
 "/                    style:(currentStyle ? '*')
@@ -933,7 +933,7 @@
             fntDescr face.
         ]
 
-"/    ^ self graphicsDevice facesInFamily:aFamilyName filtering:filter.
+"/    ^ device facesInFamily:aFamilyName filtering:filter.
 !
 
 getFamilyList 
@@ -968,7 +968,7 @@
     fontsPerFamily := d.
     ^ d keys asOrderedCollection sort
 "/
-"/    ^ self graphicsDevice fontFamiliesFiltering:combinedFilter.
+"/    ^ device fontFamiliesFiltering:combinedFilter.
 !
 
 getSizesInFamily:aFamilyName face:face style:style filtering:filter
@@ -1017,13 +1017,13 @@
     ^ sizes asOrderedCollection sort.
 
 "/    sizeUnit == #px ifTrue:[
-"/        ^ self graphicsDevice 
+"/        ^ device 
 "/             pixelSizesInFamily:(currentFamily ? '*')
 "/             face:(currentFace ? '*')
 "/             style:(currentStyle ? '*')
 "/             filtering:filter.
 "/    ] ifFalse:[
-"/        ^ self graphicsDevice 
+"/        ^ device 
 "/             sizesInFamily:(currentFamily ? '*')
 "/             face:(currentFace ? '*')
 "/             style:(currentStyle ? '*')
@@ -1048,7 +1048,7 @@
             fntDescr style.
         ]
 
-"/    ^ self graphicsDevice stylesInFamily:aFamilyName face:aFace filtering:filter.
+"/    ^ device stylesInFamily:aFamilyName face:aFace filtering:filter.
 !
 
 showPreview