mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 02:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merged changes made on r22b2-branch between r22b2 and r22b2-mac (the

Browse source 
changes from start of branch upto r22b2 were already merged, of course).
This commit is contained in:
Jack Jansen 2001-11-30 14:16:36 +00:00
parent 69b83b113f
commit b3be216b41
53 changed files with 1815 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mac/Python/macglue.c
View file

@ -505,8 +505,7 @@ scan_event_queue(force)
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 @@ scan_event_queue(force)
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 @@ PyErr_CheckSignals()
}
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 @@ PyMac_InitMenuBar()
*/
if ( (sioux_mbar=GetMenuBar()) == NULL ) {
#else
{
if ( (sioux_mbar=GetMenuBar()) == NULL || GetMenuHandle(SIOUX_APPLEID) == NULL) {
#endif
/* Sioux menu not installed yet. Do so */
SIOUXSetupMenus();