mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 03:35:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

More changes to attempt to get the menubar back on exit. Without success:-(

Browse source
This commit is contained in:
Jack Jansen 2001-02-17 22:02:07 +00:00
parent fab7415831
commit 657ba27dde
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mac/Python/macglue.c
View file

@ -162,7 +162,7 @@ int PyMac_ConsoleIsDead;
/* /*
** Sioux menu bar, saved early so we can restore it ** 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 ** Some stuff for our GetDirectory and PromptGetFile routines
@ -784,11 +784,19 @@ PyMac_InitMenuBar()
void void
PyMac_RestoreMenuBar() PyMac_RestoreMenuBar()
{ {
#if 0
/* This doesn't seem to work anymore? Or only for Carbon? */
MenuBarHandle curmenubar;
curmenubar = GetMenuBar();
if ( sioux_mbar ) { if ( sioux_mbar ) {
SetMenuBar(sioux_mbar); SetMenuBar(sioux_mbar);
DrawMenuBar(); DrawMenuBar();
} else } else {
PyMac_InitMenuBar(); PyMac_InitMenuBar();
DrawMenuBar();
}
#endif
} }

4
Mac/Python/macmain.c
View file

@ -552,6 +552,8 @@ Py_Main(argc, argv)
void void
PyMac_OutputSeen() PyMac_OutputSeen()
{ {
if ( console_output_state == STATE_UNKNOWN )
PyMac_InitMenuBar();
console_output_state = STATE_LASTREAD; console_output_state = STATE_LASTREAD;
} }
@ -561,6 +563,8 @@ PyMac_OutputSeen()
void void
PyMac_OutputNotSeen() PyMac_OutputNotSeen()
{ {
if ( console_output_state == STATE_UNKNOWN )
PyMac_InitMenuBar();
console_output_state = STATE_LASTWRITE; console_output_state = STATE_LASTWRITE;
} }