mirror of https://github.com/python/cpython.git
More changes to attempt to get the menubar back on exit. Without success:-(
This commit is contained in:
parent
fab7415831
commit
657ba27dde
|
@ -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
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue