--- a/XWorkstation.st	Sat Aug 21 20:05:39 1999 +0200
+++ b/XWorkstation.st	Mon Aug 23 14:00:59 1999 +0200
@@ -19,7 +19,7 @@
 		lengthAtom wmStateAtom listOfXFonts buttonsPressed eventRootX
 		eventRootY displayName eventTrace dispatchingExpose rgbVisual
 		virtualRootId rootId eventBuffer altModifierMask metaModifierMask
-		multiClickTime deviceErrorSignal deviceIOErrorSignal
+		multiClickTime  
 		deviceIOTimeoutErrorSignal activateOnClick'
 	classVariableNames:'RawKeysymTranslation ConservativeSync'
 	poolDictionaries:''
@@ -581,20 +581,6 @@
 
 !XWorkstation methodsFor:'Signal constants'!
 
-deviceErrorSignal
-    "return the per-device signal, which is raised when some
-     X-Error occurs."
-
-    ^ deviceErrorSignal
-!
-
-deviceIOErrorSignal
-    "return the per-device signal, which is raised when a fatal
-     IO error (i.e. broken connection) occurs."
-
-    ^ deviceIOErrorSignal
-!
-
 deviceIOTimeoutErrorSignal
     "return the per-device signal, which is raised when a timeout
      IO error (i.e. broken connection) occurs."
@@ -7406,6 +7392,17 @@
     self initializeModifierMappings
 !
 
+initializeDeviceSignals
+    super initializeDeviceSignals.
+
+    deviceIOTimeoutErrorSignal := deviceIOErrorSignal newSignalMayProceed:false.
+    deviceIOTimeoutErrorSignal nameClass:self class message:#deviceIOTimeoutErrorSignal.
+
+    ObjectMemory registerErrorInterruptHandler:self class forID:#DisplayError.
+    ObjectMemory registerErrorInterruptHandler:self class forID:#DisplayIOError.
+    ObjectMemory registerErrorInterruptHandler:self class forID:#DisplayIOTimeoutError.
+!
+
 initializeEventBuffer
     |sz|
 
@@ -7476,17 +7473,7 @@
     self initializeEventBuffer.
     self initializeSpecialFlags.
     self initializeKeyboardMap.
-
-    deviceErrorSignal := DeviceErrorSignal newSignalMayProceed:false.
-    deviceErrorSignal nameClass:self class message:#deviceErrorSignal.
-    deviceIOErrorSignal := DeviceIOErrorSignal newSignalMayProceed:false.
-    deviceIOErrorSignal nameClass:self class message:#deviceIOErrorSignal.
-    deviceIOTimeoutErrorSignal := deviceIOErrorSignal newSignalMayProceed:false.
-    deviceIOTimeoutErrorSignal nameClass:self class message:#deviceIOTimeoutErrorSignal.
-
-    ObjectMemory registerErrorInterruptHandler:self class forID:#DisplayError.
-    ObjectMemory registerErrorInterruptHandler:self class forID:#DisplayIOError.
-    ObjectMemory registerErrorInterruptHandler:self class forID:#DisplayIOTimeoutError.
+    self initializeDeviceSignals.
 !
 
 initializeModifierMappings
@@ -10200,6 +10187,6 @@
 !XWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.320 1999-07-11 11:11:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.321 1999-08-23 12:00:59 cg Exp $'
 ! !
 XWorkstation initialize!