diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 1996-09-04 15:24:59 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 1996-09-04 15:24:59 (GMT) |
| commit | f6865f77d4536d5a318aad3115be017b70180620 (patch) | |
| tree | d1836fcea76c40f6d711858bf9a0209350363aa6 /Mac/Python/macmain.c | |
| parent | 2e049b2b05e0f47592378f6e281eb2dc75e0e4d9 (diff) | |
| download | cpython-f6865f77d4536d5a318aad3115be017b70180620.zip cpython-f6865f77d4536d5a318aad3115be017b70180620.tar.gz cpython-f6865f77d4536d5a318aad3115be017b70180620.tar.bz2 | |
- Fixed PyMac_DoYield:
- Update lastyield correctly
- Do event handling if PyMac_YieldEnabled > 0 (previous cmd-. fix
broke this)
- Use our own GUSISpin routine: fixes crash when exiting with sockets
open and keeps windows, etc reacting consistently when waiting for
accepts(), etc.
Diffstat (limited to 'Mac/Python/macmain.c')
| -rw-r--r-- | Mac/Python/macmain.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c index 7241539..019e0be 100644 --- a/Mac/Python/macmain.c +++ b/Mac/Python/macmain.c @@ -28,6 +28,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "pythonresources.h" #include "import.h" #include "marshal.h" +#include "macglue.h" #include <Memory.h> #include <Resources.h> @@ -108,6 +109,7 @@ init_common() #if defined(USE_GUSI) /* Setup GUSI */ GUSIDefaultSetup(); + PyMac_SetGUSISpin(); #endif #ifdef USE_SIOUX @@ -396,7 +398,14 @@ PyMac_Exit(status) } else SIOUXSettings.autocloseonquit = 1; -#endif +#ifdef USE_GUSI + /* + ** Workaround for Sioux/GUSI combo: we should not call + ** SiouxHandleOneEvent after the window is closed + */ + PyMac_ConsoleIsDead = 1; +#endif /* USE_GUSI */ +#endif /* USE_SIOUX */ #ifdef THINK_C console_options.pause_atexit = keep; #endif |