Mercurial > cpython-lru_cache-weakref

diff Mac/Python/macglue.c @ 21113:ed3dce17fc79 legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged changes made on r22b2-branch between r22b2 and r22b2-mac (the changes from start of branch upto r22b2 were already merged, of course).
author Jack Jansen <jack.jansen@cwi.nl>
date Fri, 30 Nov 2001 14:16:36 +0000
parents d27ce8fe43f8
children 848f6988829f
line wrap: on
line diff
--- a/Mac/Python/macglue.c	Fri Nov 30 07:23:05 2001 +0000
+++ b/Mac/Python/macglue.c	Fri Nov 30 14:16:36 2001 +0000
@@ -505,8 +505,7 @@
 		if (q->evtQWhat == keyDown &&
 				(char)q->evtQMessage == '.' &&
 				(q->evtQModifiers & cmdKey) != 0) {
-			if ( flush )
-				FlushEvents(keyDownMask, 0);
+			FlushEvents(keyDownMask, 0);
 			interrupted = 1;
 			break;
 		}
@@ -517,8 +516,6 @@
 int
 PyErr_CheckSignals()
 {
-	int xxx, xxx_old;
-	
 	if (schedparams.enabled) {
 		if ( interrupted || (unsigned long)LMGetTicks() > schedparams.next_check ) {
 			scan_event_queue(0);
@@ -529,8 +526,6 @@
 			}
 			if ( PyMac_Yield() < 0)
 				return -1;
-			xxx = LMGetTicks();
-			xxx_old = schedparams.next_check;
 			schedparams.next_check = (unsigned long)LMGetTicks()
 					 + schedparams.check_interval;
 		}
@@ -734,7 +729,7 @@
 	*/
 	if ( (sioux_mbar=GetMenuBar()) == NULL )  {
 #else
-	{
+	if ( (sioux_mbar=GetMenuBar()) == NULL || GetMenuHandle(SIOUX_APPLEID) == NULL)  {
 #endif
 		/* Sioux menu not installed yet. Do so */
 		SIOUXSetupMenus();