--- a/DeviceWorkstation.st	Wed Dec 29 14:05:12 2004 +0100
+++ b/DeviceWorkstation.st	Tue Jan 11 18:05:04 2005 +0100
@@ -4288,7 +4288,7 @@
     "the actual event dispatching loop."
 
     [dispatching] whileTrue:[
-        AbortOperationRequest handle:[:ex |
+        AbortAllOperationRequest handle:[:ex |
             ex return
         ] do:[
             self eventPending ifFalse:[
@@ -5523,14 +5523,12 @@
         prevKnownViews do:[:aView |
             (aView notNil and:[aView ~~ 0]) ifTrue:[
                 "have to re-create the view"
-                UserInterrupt catch:[
-                    AbortOperationRequest catch:[
-                        GraphicsContext drawingOnClosedDrawableSignal handle:[:ex |
-                            'DeviceWorkstation [warning]: drawing attempt on closed drawable during reinit' errorPrintCR.
-                            ex return
-                        ] do:[
-                            aView reinitialize
-                        ]
+                (UserInterrupt, AbortAllOperationRequest) catch:[
+                    GraphicsContext drawingOnClosedDrawableSignal handle:[:ex |
+                        'DeviceWorkstation [warning]: drawing attempt on closed drawable during reinit' errorPrintCR.
+                        ex return
+                    ] do:[
+                        aView reinitialize
                     ]
                 ]
             ]
@@ -7472,7 +7470,7 @@
 !DeviceWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.483 2004-09-24 15:02:41 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.484 2005-01-11 17:05:02 stefan Exp $'
 ! !
 
 DeviceWorkstation initialize!

--- a/WindowGroup.st	Wed Dec 29 14:05:12 2004 +0100
+++ b/WindowGroup.st	Tue Jan 11 18:05:04 2005 +0100
@@ -1289,7 +1289,7 @@
     thisProcess := Processor activeProcess.
 
     sigs := SignalSet 
-                with:AbortOperationRequest 
+                with:AbortAllOperationRequest 
                 with:LeaveSignal 
                 with:(self class activityNotificationSignal).
 
@@ -1347,7 +1347,8 @@
             sigs handle:[:ex |
                 |theSig|
 
-                (theSig := ex signal) == AbortOperationRequest ifTrue:[
+                theSig := ex signal.
+                (AbortAllOperationRequest accepts:theSig) ifTrue:[
                     "/
                     "/ on abort, stay in loop
                     "/
@@ -1368,7 +1369,7 @@
                 "/ otherwise show the activityMessage and continue.
                 "/
                 isModal ifTrue:[
-                    (ex signal isHandledIn:ex handlerContext sender) ifFalse:[
+                    (theSig isHandledIn:ex handlerContext sender) ifFalse:[
                         ex proceedWith:nil.
                     ].
                     ex reject
@@ -2764,7 +2765,7 @@
 !WindowGroup class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.269 2004-11-10 17:38:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.270 2005-01-11 17:05:04 stefan Exp $'
 ! !
 
 WindowGroup initialize!