From 8c89a6fdc7142941150cd62253a07d1f79865b49 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Sun, 19 Feb 1995 15:52:17 +0000 Subject: use PyMac_GetArgv (in macgetargv.c) for applet inits --- Mac/Python/macglue.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c index 3c67221..d2797e7 100644 --- a/Mac/Python/macglue.c +++ b/Mac/Python/macglue.c @@ -748,21 +748,10 @@ PyMac_BuildEventRecord(EventRecord *e) } -/* What follows is used only by applets. */ - -static void -init_mac_world() -{ - MaxApplZone(); - InitGraf(&qd.thePort); - InitFonts(); - InitWindows(); - TEInit(); - InitDialogs((long)0); - InitMenus(); - InitCursor(); -} +/* ---------- */ +/* Applet support */ +/* Run a compiled Python Python script from 'PYC ' resource __main__ */ static int run_main_resource() { @@ -795,14 +784,16 @@ run_main_resource() return 0; } +/* Initialization sequence for applets */ void PyMac_InitApplet() { - static char *argv[] = {"__main__", NULL}; + int argc; + char **argv; - init_mac_world(); + argc = PyMac_GetArgv(&argv); Py_Initialize(); - PySys_SetArgv((sizeof argv / sizeof argv[0]) - 1, argv); + PySys_SetArgv(argc, argv); run_main_resource(); fflush(stderr); fflush(stdout); -- cgit v0.12