--- a/FontPanel.st	Sun May 18 09:45:08 2014 +0100
+++ b/FontPanel.st	Mon Sep 08 17:03:09 2014 +0100
@@ -588,7 +588,7 @@
         encodingLabel beInvisible
     ].
 
-    XftFontDescription notNil ifTrue:[
+    (XftFontDescription notNil and:[Display supportsXFTFonts]) ifTrue:[
         UserPreferences current useXftFontsOnly ifTrue:[
             self xftFontsOnlyHolder value: true.
         ] ifFalse:[
@@ -820,9 +820,10 @@
         ^ nil.
     ].
 
-    font := (self xftFontsOnlyHolder value
-                ifTrue:[XftFontDescription]
-                ifFalse:[Font])
+    font := 
+        ((Display supportsXFTFonts and:[self xftFontsOnlyHolder value])
+            ifTrue:[XftFontDescription]
+            ifFalse:[Font])
               family:currentFamily 
               face:currentFace 
               style:currentStyle
@@ -1253,7 +1254,7 @@
     okAction notNil ifTrue:[
         currentFamily notNil ifTrue:[
             okAction value:
-                ((self xftFontsOnlyHolder value
+                (((Display supportsXFTFonts and:[ self xftFontsOnlyHolder value ])
                         ifTrue:[XftFontDescription]
                         ifFalse:[FontDescription])
                       family:currentFamily 
@@ -1318,10 +1319,10 @@
 !FontPanel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.126 2014-04-27 21:57:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.127 2014-07-08 23:20:57 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.126 2014-04-27 21:57:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.127 2014-07-08 23:20:57 cg Exp $'
 ! !