diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-02-17 22:02:07 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-02-17 22:02:07 (GMT) |
| commit | 657ba27ddecd7393e6a93e5c7249573ed0174d72 (patch) | |
| tree | 0654b3739ceafb9e070f981171639f422214c0d8 /Mac | |
| parent | fab7415831607dbddc0dbc55c2409a0fc9dd2cd4 (diff) | |
| download | cpython-657ba27ddecd7393e6a93e5c7249573ed0174d72.zip cpython-657ba27ddecd7393e6a93e5c7249573ed0174d72.tar.gz cpython-657ba27ddecd7393e6a93e5c7249573ed0174d72.tar.bz2 | |
More changes to attempt to get the menubar back on exit. Without success:-(
Diffstat (limited to 'Mac')
| -rw-r--r-- | Mac/Python/macglue.c | 12 | ||||
| -rw-r--r-- | Mac/Python/macmain.c | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c index 6321421..52bc225 100644 --- a/Mac/Python/macglue.c +++ b/Mac/Python/macglue.c @@ -162,7 +162,7 @@ int PyMac_ConsoleIsDead; /* ** Sioux menu bar, saved early so we can restore it */ -static Handle sioux_mbar; +static MenuBarHandle sioux_mbar; /* ** Some stuff for our GetDirectory and PromptGetFile routines @@ -784,11 +784,19 @@ PyMac_InitMenuBar() void PyMac_RestoreMenuBar() { +#if 0 + /* This doesn't seem to work anymore? Or only for Carbon? */ + MenuBarHandle curmenubar; + + curmenubar = GetMenuBar(); if ( sioux_mbar ) { SetMenuBar(sioux_mbar); DrawMenuBar(); - } else + } else { PyMac_InitMenuBar(); + DrawMenuBar(); + } +#endif } diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c index 09d8648..bb798f2 100644 --- a/Mac/Python/macmain.c +++ b/Mac/Python/macmain.c @@ -552,6 +552,8 @@ Py_Main(argc, argv) void PyMac_OutputSeen() { + if ( console_output_state == STATE_UNKNOWN ) + PyMac_InitMenuBar(); console_output_state = STATE_LASTREAD; } @@ -561,6 +563,8 @@ PyMac_OutputSeen() void PyMac_OutputNotSeen() { + if ( console_output_state == STATE_UNKNOWN ) + PyMac_InitMenuBar(); console_output_state = STATE_LASTWRITE; } |