--- a/XWorkstation.st	Tue Nov 10 17:29:49 2009 +0100
+++ b/XWorkstation.st	Tue Nov 10 17:31:31 2009 +0100
@@ -12,31 +12,31 @@
 "{ Package: 'stx:libview' }"
 
 DeviceWorkstation subclass:#XWorkstation
-        instanceVariableNames:'hasShapeExtension hasShmExtension hasDPSExtension
-                hasMbufExtension hasXVideoExtension hasSaveUnder hasPEXExtension
-                hasImageExtension hasInputExtension ignoreBackingStore blackpixel
-                whitepixel atoms protocolsAtom deleteWindowAtom saveYourselfAtom
-                quitAppAtom primaryAtom clipboardAtom stringAtom wmStateAtom
-                motifWMHintsAtom listOfXFonts buttonsPressed eventRootX
-                eventRootY displayName eventTrace dispatchingExpose rgbVisual
-                virtualRootId rootId altModifierMask metaModifierMask
-                lastEventTime lastButtonPressTime deviceIOTimeoutErrorSignal
-                activateOnClick rawKeySymTranslation selectionOwner selectionTime
-                selectionFetchers selectionHandlers preWaitAction xlibTimeout
-                xlibTimeoutForWindowCreation hasConnectionBroken uniqueDeviceID
-                stxDeviceAtom uuidAtom'
-        classVariableNames:'RawKeySymTranslation ConservativeSync MaxStringLength
-                DefaultXLibTimeout DefaultXLibTimeoutForWindowCreation'
-        poolDictionaries:''
-        category:'Interface-Graphics'
+	instanceVariableNames:'hasShapeExtension hasShmExtension hasDPSExtension
+		hasMbufExtension hasXVideoExtension hasSaveUnder hasPEXExtension
+		hasImageExtension hasInputExtension ignoreBackingStore blackpixel
+		whitepixel atoms protocolsAtom deleteWindowAtom saveYourselfAtom
+		quitAppAtom primaryAtom clipboardAtom stringAtom wmStateAtom
+		motifWMHintsAtom listOfXFonts buttonsPressed eventRootX
+		eventRootY displayName eventTrace dispatchingExpose rgbVisual
+		virtualRootId rootId altModifierMask metaModifierMask
+		lastEventTime lastButtonPressTime deviceIOTimeoutErrorSignal
+		activateOnClick rawKeySymTranslation selectionOwner selectionTime
+		selectionFetchers selectionHandlers preWaitAction xlibTimeout
+		xlibTimeoutForWindowCreation hasConnectionBroken uniqueDeviceID
+		stxDeviceAtom uuidAtom'
+	classVariableNames:'RawKeySymTranslation ConservativeSync MaxStringLength
+		DefaultXLibTimeout DefaultXLibTimeoutForWindowCreation'
+	poolDictionaries:''
+	category:'Interface-Graphics'
 !
 
 Object subclass:#SelectionFetcher
-        instanceVariableNames:'sema message display drawableID selectionID propertyID targetID
-                buffer done incremental'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:XWorkstation
+	instanceVariableNames:'sema message display drawableID selectionID propertyID targetID
+		buffer done incremental'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:XWorkstation
 !
 
 !XWorkstation primitiveDefinitions!
@@ -6375,8 +6375,8 @@
 
      |d|
      d := Dictionary new.
-     (Screen current fontPropertiesOf:Screen current getDefaultFont) pairWiseDo:[:name :value|
-          d at:((Screen current atomName:name) ? name) put:value
+     (Screen current fontPropertiesOf:Screen current getDefaultFont) keysAndValuesDo:[:name :value|
+          d at:name put:((Screen current atomName:value) ? value)
      ].
      d
     "
@@ -6732,6 +6732,7 @@
             ^ nil
         ].
         listOfXFonts := names collect:[:aName | self fontDescriptionFromXFontName:aName].
+        listOfXFonts := FontDescription genericFonts, listOfXFonts.
     ].
     ^ listOfXFonts
 
@@ -12028,11 +12029,11 @@
 !XWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.510 2009-11-05 14:37:06 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.511 2009-11-10 16:31:31 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.510 2009-11-05 14:37:06 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.511 2009-11-10 16:31:31 stefan Exp $'
 ! !
 
 XWorkstation initialize!