--- a/Tools__FontSettingsApplication.st	Tue Jul 08 23:53:53 2014 +0200
+++ b/Tools__FontSettingsApplication.st	Wed Jul 09 01:20:42 2014 +0200
@@ -868,7 +868,7 @@
 changeToSTXLookXft
     |fixFont variableFont|
 
-    XftFontDescription isNil ifTrue:[
+    (Display supportsXFTFonts and:[XftFontDescription notNil]) ifTrue:[
         self changeToSTXLook.
         ^ self.
     ].
@@ -1224,16 +1224,16 @@
 !
 
 hasXftFonts
-    ^ (Display platformName = 'X11') and:[ XftFontDescription notNil ]
+    ^ (Display supportsXFTFonts) and:[ XftFontDescription notNil ]
 ! !
 
 !FontSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__FontSettingsApplication.st,v 1.7 2014-07-03 12:01:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__FontSettingsApplication.st,v 1.8 2014-07-08 23:20:42 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__FontSettingsApplication.st,v 1.7 2014-07-03 12:01:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__FontSettingsApplication.st,v 1.8 2014-07-08 23:20:42 cg Exp $'
 ! !