diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-04-25 22:07:27 +0000 |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-04-25 22:07:27 +0000 |
| commit | 15f1c08d96da1792548d2e3cf17ebd7dd9ba078e (patch) | |
| tree | 3a00bcd0b7ff7cae2ab0c08003f2198d36b80207 /Mac/Python/macmain.c | |
| parent | ee677913df35c8c4c5ea91e3c85a3061f01bb26d (diff) | |
| download | cpython-git-15f1c08d96da1792548d2e3cf17ebd7dd9ba078e.tar.gz | |
- Raise console window on input. Fixes Carbon hang.
- Better handling of menu bar save/restore.
- Override abort() so it honours the "keep console window" flag.
Diffstat (limited to 'Mac/Python/macmain.c')
| -rw-r--r-- | Mac/Python/macmain.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c index bb798f2b99..1d5500f483 100644 --- a/Mac/Python/macmain.c +++ b/Mac/Python/macmain.c @@ -567,7 +567,16 @@ PyMac_OutputNotSeen() PyMac_InitMenuBar(); console_output_state = STATE_LASTWRITE; } - + +/* +** Override abort() - The default one is not what we want. +*/ +void +abort() +{ + console_output_state = STATE_LASTWRITE; + PyMac_Exit(1); +} /* ** Terminate application @@ -605,6 +614,7 @@ PyMac_Exit(status) SIOUXSettings.standalone = 1; SIOUXSettings.autocloseonquit = 0; SIOUXSetTitle("\p\307terminated\310"); + PyMac_RaiseConsoleWindow(); PyMac_RestoreMenuBar(); #ifdef USE_MSL /* |