--- a/XWorkstation.st	Tue Aug 24 01:06:14 1999 +0200
+++ b/XWorkstation.st	Tue Aug 24 01:06:43 1999 +0200
@@ -19,8 +19,7 @@
 		lengthAtom wmStateAtom listOfXFonts buttonsPressed eventRootX
 		eventRootY displayName eventTrace dispatchingExpose rgbVisual
 		virtualRootId rootId eventBuffer altModifierMask metaModifierMask
-		multiClickTime  
-		deviceIOTimeoutErrorSignal activateOnClick'
+		multiClickTime deviceIOTimeoutErrorSignal activateOnClick'
 	classVariableNames:'RawKeysymTranslation ConservativeSync'
 	poolDictionaries:''
 	category:'Interface-Graphics'
@@ -7386,10 +7385,7 @@
 
 initializeDefaultValues
     activateOnClick := false.
-    buttonTranslation := ButtonTranslation.
-    multiClickTimeDelta := MultiClickTimeDelta.
-
-    self initializeModifierMappings
+    super initializeDefaultValues.
 !
 
 initializeDeviceSignals
@@ -7484,45 +7480,40 @@
 "/    ctrlModifiers := #(Control_L Control_R).
 "/    shiftModifiers := #(Shift_L Shift_R).
 
-    shiftModifiers := ctrlModifiers := altModifiers := metaModifiers := nil.
+    super initializeModifierMappings.
     altModifierMask := metaModifierMask := nil.
 
     map := self modifierMapping.
     map isNil ifTrue:[
-	"/
-	"/ mhmh - a crippled Xlib which does not provide modifier mappings
-	"/ setup some reasonable default. If that is not sufficient,
-	"/ you have to change things from your display.rc file.
-	"/
-	altModifierMask := self modifier1Mask.
-	metaModifierMask := self modifier2Mask.
-
-	shiftModifiers := #(Shift_L Shift_R Shift).
-	ctrlModifiers := #(Control_L Control_R Control).
-	metaModifiers := #(Alt_L Meta_L Meta_R Meta).
-	altModifiers := #(Alt_R Alt).
+        "/
+        "/ mhmh - a crippled Xlib which does not provide modifier mappings
+        "/ setup some reasonable default. If that is not sufficient,
+        "/ you have to change things from your display.rc file.
+        "/
+        altModifierMask := self modifier1Mask.
+        metaModifierMask := self modifier2Mask.
     ] ifFalse:[
-	altModifierMask := 0.
-	metaModifierMask := 0.
-
-	mod := map at:1.
-	mod notNil ifTrue:[
-	    shiftModifiers := mod collect:[ :key | self stringFromKeycode:key ].
-	].
-	mod := map at:3.
-	mod notNil ifTrue:[
-	    ctrlModifiers  := mod collect:[ :key | self stringFromKeycode:key ].
-	].
-	mod := map at:4.
-	mod notNil ifTrue:[
-	    metaModifiers  := mod collect:[ :key | self stringFromKeycode:key ].    
-	    metaModifierMask := 1 bitShift:(4-1).
-	].
-	mod := map at:5.
-	mod notNil ifTrue:[
-	    altModifiers   := mod collect:[ :key | self stringFromKeycode:key ].    
-	    altModifierMask := 1 bitShift:(5-1).
-	]
+        altModifierMask := 0.
+        metaModifierMask := 0.
+
+        mod := map at:1.
+        mod notNil ifTrue:[
+            shiftModifiers := mod collect:[ :key | self stringFromKeycode:key ].
+        ].
+        mod := map at:3.
+        mod notNil ifTrue:[
+            ctrlModifiers  := mod collect:[ :key | self stringFromKeycode:key ].
+        ].
+        mod := map at:4.
+        mod notNil ifTrue:[
+            metaModifiers  := mod collect:[ :key | self stringFromKeycode:key ].    
+            metaModifierMask := 1 bitShift:(4-1).
+        ].
+        mod := map at:5.
+        mod notNil ifTrue:[
+            altModifiers   := mod collect:[ :key | self stringFromKeycode:key ].    
+            altModifierMask := 1 bitShift:(5-1).
+        ]
     ].
 
     "Modified: 1.12.1995 / 23:44:40 / stefan"
@@ -10187,6 +10178,6 @@
 !XWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.322 1999-08-23 12:02:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.323 1999-08-23 23:06:43 cg Exp $'
 ! !
 XWorkstation initialize!