Mercurial > cpython-lru_cache-weakref
diff Mac/Python/macglue.c @ 5732:f027dd0a85e4 legacy-trunk
- Restore SIOUX menubar just before exiting, if the console window is kept
open (so the user can quit with cmd-Q, print, etc)
- Removed a few unused routines
| author | Jack Jansen <jack.jansen@cwi.nl> |
|---|---|
| date | Thu, 12 Jun 1997 10:49:13 +0000 |
| parents | fb170ce82951 |
| children | d0c6b49d7101 |
line wrap: on
line diff
--- a/Mac/Python/macglue.c Fri Jun 06 21:57:35 1997 +0000 +++ b/Mac/Python/macglue.c Thu Jun 12 10:49:13 1997 +0000 @@ -160,6 +160,11 @@ int PyMac_ConsoleIsDead; /* +** Sioux menu bar, saved early so we can restore it +*/ +static Handle sioux_mbar; + +/* ** Some stuff for our GetDirectory and PromptGetFile routines */ struct hook_args { @@ -415,8 +420,6 @@ } } -#define TICKCOUNT 6 - int PyOS_InterruptOccurred() { @@ -426,6 +429,7 @@ schedparams.next_check = (unsigned long)LMGetTicks() + schedparams.check_interval; if (interrupted) { + scan_event_queue(1); /* Eat events up to cmd-. */ interrupted = 0; return 1; } @@ -434,23 +438,6 @@ return 0; } -#if 0 - -/* intrpeek() is like intrcheck(), but it doesn't flush the events. The -** idea is that you call intrpeek() somewhere in a busy-wait loop, and return -** None as soon as it returns 1. The mainloop will then pick up the cmd-. soon -** thereafter. -*/ -static int -intrpeek() -{ -#ifdef THINK_C - scan_event_queue(0); -#endif - return interrupted; -} -#endif - /* Check whether we are in the foreground */ int PyMac_InForeground() @@ -505,6 +492,7 @@ } } #endif /* !__MWERKS__ */ + printf("not handled\n"); } /* @@ -596,21 +584,37 @@ schedparams.enabled = 0; schedparams.next_check = 0; /* Check immedeately */ } + /* ** Install our menu bar. */ void PyMac_InitMenuBar() { - Handle bar; MenuHandle applemenu; - if ( (bar=GetMenuBar()) == NULL ) return; + if ( (sioux_mbar=GetMenuBar()) == NULL ) { + /* Sioux menu not installed yet. Do so */ + SIOUXSetupMenus(); + if ( (sioux_mbar=GetMenuBar()) == NULL ) + return; + } if ( (applemenu=GetMenuHandle(SIOUX_APPLEID)) == NULL ) return; SetMenuItemText(applemenu, 1, "\pAbout Python..."); } /* +** Restore sioux menu bar +*/ +void +PyMac_RestoreMenuBar() +{ + if ( sioux_mbar ) + SetMenuBar(sioux_mbar); +} + + +/* ** Our replacement about box */ void
