From: Jack Jansen <jack.jansen@cwi.nl>
Date: Sat, 17 Feb 2001 22:02:07 +0000 (+0000)
Subject: More changes to attempt to get the menubar back on exit. Without success:-(
X-Git-Tag: v2.1b1~321
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=657ba27ddecd7393e6a93e5c7249573ed0174d72;p=python

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 6321421720..52bc22584e 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 09d86486d2..bb798f2b99 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;
 }