Adapted to new event handling. It is now also possible to abort out of

an AESend with command-. (unless specifically disabled, of course).

diff --git a/Mac/Modules/ae/AEmodule.c b/Mac/Modules/ae/AEmodule.c
index e12c6c87abc245233ba4eacf56473ace60721196..dd4a197ffc03520a5d5d21546e295f49692fa9d4 100644 (file)
--- a/Mac/Modules/ae/AEmodule.c
+++ b/Mac/Modules/ae/AEmodule.c
@@ -72,7 +72,12 @@ AEEventHandlerUPP upp_GenericEventHandler;
 
 static pascal Boolean AEIdleProc(EventRecord *theEvent, long *sleepTime, RgnHandle *mouseRgn)
 {
-       PyMac_Yield();
+       if ( PyOS_InterruptOccurred() )
+               return 1;
+       if ( PyMac_HandleEvent(theEvent) < 0 ) {
+               fprintf(stderr, "Exception in user event handler during AE processing\n");
+               PyErr_Clear();
+       }
        return 0;
 }
 

diff --git a/Mac/Modules/ae/aesupport.py b/Mac/Modules/ae/aesupport.py
index 8e4c7a3a44842fef94c628f3c02c954bf9503c10..707e956ad1ac5b3253749ee285e542fec9193d9e 100644 (file)
--- a/Mac/Modules/ae/aesupport.py
+++ b/Mac/Modules/ae/aesupport.py
@@ -111,7 +111,12 @@ AEEventHandlerUPP upp_GenericEventHandler;
 
 static pascal Boolean AEIdleProc(EventRecord *theEvent, long *sleepTime, RgnHandle *mouseRgn)
 {
-       PyMac_Yield();
+       if ( PyOS_InterruptOccurred() )
+               return 1;
+       if ( PyMac_HandleEvent(theEvent) < 0 ) {
+               fprintf(stderr, "Exception in user event handler during AE processing\\n");
+               PyErr_Clear();
+       }
        return 0;
 }