From: Jack Jansen <jack.jansen@cwi.nl>
Date: Thu, 1 Nov 2001 23:17:35 +0000 (+0000)
Subject: We always install the Sioux menubar, in stead of only when no menubar
X-Git-Tag: v2.2.1c1~915
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95837f1973c0343f33bab0cc0fc98c32856d53e1;p=thirdparty%2FPython%2Fcpython.git

We always install the Sioux menubar, in stead of only when no menubar
was installed previously. This fixes bug #476904, but I'm not 100%
sure it doesn't break anything else. But if it does I'll notice tomorrow
when I try to build GRiNS:-)
---

diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
index 4e8c9e48a62e..13dbbe7f344e 100644
--- a/Mac/Python/macglue.c
+++ b/Mac/Python/macglue.c
@@ -720,7 +720,15 @@ PyMac_InitMenuBar()
 	MenuHandle applemenu;
 	
 	if ( sioux_mbar ) return;
+#if 0
+	/* This code does not seem to work anymore: apparently
+	** we now always have a menubar (since MacOS9?).
+	** So we simply always setup the Sioux menus here.
+	*/
 	if ( (sioux_mbar=GetMenuBar()) == NULL )  {
+#else
+	{
+#endif
 		/* Sioux menu not installed yet. Do so */
 		SIOUXSetupMenus();
 		if ( (sioux_mbar=GetMenuBar()) == NULL )