[Python-checkins] CVS: python/dist/src/Mac/Python macglue.c,1.105,1.106

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Python
In directory usw-pr-cvs1:/tmp/cvs-serv14154/Python/Mac/Python

Modified Files:
	macglue.c 
Log Message:
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:-)

Index: macglue.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Python/macglue.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** macglue.c	2001/09/11 09:22:19	1.105
--- macglue.c	2001/11/01 23:17:35	1.106
***************
*** 721,725 ****
--- 721,733 ----
  	
  	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();