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

jackjansen · jackjansen · commit 657ba27ddecd · 2001-02-17T22:02:07.000Z
diff --git 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
@@ -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;
 }
 	

Original file line number	Diff line number	Diff line change
`@@ -552,6 +552,8 @@ Py_Main(argc, argv)`
`552`	`552`	`void`
`553`	`553`	`PyMac_OutputSeen()`
`554`	`554`	`{`
	`555`	`+ if ( console_output_state == STATE_UNKNOWN )`
	`556`	`+ PyMac_InitMenuBar();`
`555`	`557`	`console_output_state = STATE_LASTREAD;`
`556`	`558`	`}`
`557`	`559`
`@@ -561,6 +563,8 @@ PyMac_OutputSeen()`
`561`	`563`	`void`
`562`	`564`	`PyMac_OutputNotSeen()`
`563`	`565`	`{`
	`566`	`+ if ( console_output_state == STATE_UNKNOWN )`
	`567`	`+ PyMac_InitMenuBar();`
`564`	`568`	`console_output_state = STATE_LASTWRITE;`
`565`	`569`	`}`
`566`	`570`