From 6b6e61dd328c16d848be7e470677dee749085bfa Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Mon, 15 Feb 1999 21:33:34 +0000 Subject: [PATCH] (finally) unified the interpreter and the applet as Just suggested ages ago. The resulting program is called PythonInterpreter. --- Mac/Python/macapplet.c | 36 ------------------------------------ Mac/Python/macapplication.c | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 39 deletions(-) delete mode 100644 Mac/Python/macapplet.c diff --git a/Mac/Python/macapplet.c b/Mac/Python/macapplet.c deleted file mode 100644 index d290ad80f7..0000000000 --- a/Mac/Python/macapplet.c +++ /dev/null @@ -1,36 +0,0 @@ -/*********************************************************** -Copyright 1991-1997 by Stichting Mathematisch Centrum, Amsterdam, -The Netherlands. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the names of Stichting Mathematisch -Centrum or CWI not be used in advertising or publicity pertaining to -distribution of the software without specific, written prior permission. - -STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO -THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE -FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT -OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -******************************************************************/ - -/* Macintosh Applet Python main program */ - -#ifdef __CFM68K__ -#pragma lib_export on -#endif - -extern void PyMac_InitApplet(); - -void -main() { - PyMac_InitApplet(); -} diff --git a/Mac/Python/macapplication.c b/Mac/Python/macapplication.c index fbe6415f16..a92eb3a128 100644 --- a/Mac/Python/macapplication.c +++ b/Mac/Python/macapplication.c @@ -22,15 +22,24 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* Macintosh Applet Python main program */ +/* Macintosh Python main program for both applets and interpreter */ -#ifdef SYMANTEC__CFM68K__ +#include + +#ifdef __CFM68K__ #pragma lib_export on #endif +extern void PyMac_InitApplet(); extern void PyMac_InitApplication(); void main() { - PyMac_InitApplication(); + Handle mainpyc; + + mainpyc = Get1NamedResource('PYC ', "\p__main__"); + if (mainpyc != NULL) + PyMac_InitApplet(); + else + PyMac_InitApplication(); } -- 2.40.0