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

[Jack Jansen]

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

Modified Files:
	macglue.c 
Log Message:
Merged changes made on r22b2-branch between r22b2 and r22b2-mac (the
changes from start of branch upto r22b2 were already merged, of course).


Index: macglue.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Python/macglue.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** macglue.c	2001/11/10 00:41:43	1.107
--- macglue.c	2001/11/30 14:16:34	1.108
***************
*** 506,511 ****
  				(char)q->evtQMessage == '.' &&
  				(q->evtQModifiers & cmdKey) != 0) {
! 			if ( flush )
! 				FlushEvents(keyDownMask, 0);
  			interrupted = 1;
  			break;
--- 506,510 ----
  				(char)q->evtQMessage == '.' &&
  				(q->evtQModifiers & cmdKey) != 0) {
! 			FlushEvents(keyDownMask, 0);
  			interrupted = 1;
  			break;
***************
*** 518,523 ****
  PyErr_CheckSignals()
  {
- 	int xxx, xxx_old;
- 	
  	if (schedparams.enabled) {
  		if ( interrupted || (unsigned long)LMGetTicks() > schedparams.next_check ) {
--- 517,520 ----
***************
*** 530,535 ****
  			if ( PyMac_Yield() < 0)
  				return -1;
- 			xxx = LMGetTicks();
- 			xxx_old = schedparams.next_check;
  			schedparams.next_check = (unsigned long)LMGetTicks()
  					 + schedparams.check_interval;
--- 527,530 ----
***************
*** 735,739 ****
  	if ( (sioux_mbar=GetMenuBar()) == NULL )  {
  #else
! 	{
  #endif
  		/* Sioux menu not installed yet. Do so */
--- 730,734 ----
  	if ( (sioux_mbar=GetMenuBar()) == NULL )  {
  #else
! 	if ( (sioux_mbar=GetMenuBar()) == NULL || GetMenuHandle(SIOUX_APPLEID) == NULL)  {
  #endif
  		/* Sioux menu not installed yet. Do so */