diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-11-30 14:16:36 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-11-30 14:16:36 (GMT) |
| commit | b3be216b41a4755556a887baa6ab440279fbe1dc (patch) | |
| tree | f7b1e40f24563a9800d31b517cac615c991b0d09 /Mac/Python | |
| parent | 69b83b113f9e6fed321288ea23bca2aa673a7beb (diff) | |
| download | cpython-b3be216b41a4755556a887baa6ab440279fbe1dc.zip cpython-b3be216b41a4755556a887baa6ab440279fbe1dc.tar.gz cpython-b3be216b41a4755556a887baa6ab440279fbe1dc.tar.bz2 | |
Merged changes made on r22b2-branch between r22b2 and r22b2-mac (the
changes from start of branch upto r22b2 were already merged, of course).
Diffstat (limited to 'Mac/Python')
| -rw-r--r-- | Mac/Python/macglue.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c index 2789fef..f9c9aff 100644 --- a/Mac/Python/macglue.c +++ b/Mac/Python/macglue.c @@ -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(); |