[Python-checkins] python/dist/src/Include pymactoolbox.h,1.4,1.5

[jackjansen@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Include
In directory usw-pr-cvs1:/tmp/cvs-serv4439/Include

Modified Files:
	pymactoolbox.h 
Log Message:
Added one call to Py_Main(), for OSX framework builds only, that will get the
actual script to run in case we are running from an applet. If we are indeed
running an applet we skip the normal option processing leaving it all to the
applet code.

This allows us to get use the normal python binary in the Python.app bundle,
giving us all the normal command line options through PythonLauncher while
still allowing Python.app to be used as the template for building applets.

Consequently, pythonforbundle is gone, and Mac/Python/macmain.c isn't used
on OSX anymore.


Index: pymactoolbox.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pymactoolbox.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pymactoolbox.h	5 Nov 2001 14:39:22 -0000	1.4
--- pymactoolbox.h	2 Aug 2002 14:11:22 -0000	1.5
***************
*** 35,39 ****
  PyObject *PyMac_Error(OSErr);				/* Uses PyMac_GetOSErrException */
  extern OSErr PyMac_GetFullPathname(FSSpec *, char *, int); /* convert fsspec->path */
! 
  /*
  ** These conversion routines are defined in mactoolboxglue.c itself.
--- 35,41 ----
  PyObject *PyMac_Error(OSErr);				/* Uses PyMac_GetOSErrException */
  extern OSErr PyMac_GetFullPathname(FSSpec *, char *, int); /* convert fsspec->path */
! #ifdef WITH_NEXT_FRAMEWORK
! extern char *PyMac_GetAppletScriptFile(void);	/* Return applet script file or NULL */
! #endif
  /*
  ** These conversion routines are defined in mactoolboxglue.c itself.