More changes to attempt to get the menubar back on exit. Without success:-(
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 @@
/*
** 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 @@
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 @@
void
PyMac_OutputSeen()
{
+ if ( console_output_state == STATE_UNKNOWN )
+ PyMac_InitMenuBar();
console_output_state = STATE_LASTREAD;
}
@@ -561,6 +563,8 @@
void
PyMac_OutputNotSeen()
{
+ if ( console_output_state == STATE_UNKNOWN )
+ PyMac_InitMenuBar();
console_output_state = STATE_LASTWRITE;
}