mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
MAde a few things more orthogonal and did some cleanups:
- Applications now have their (minimal) main prrogram in macapplication.c and the rest of the init code in macglue.c. - A new define, USE_MAC_APPLET_SUPPORT, independent of USE_MAC_SHARED_LIB - chdir to script directory now done in PyMac_InitApplication.
This commit is contained in:
parent
397c3fb4d7
commit
76efd8e7a1
3 changed files with 74 additions and 36 deletions
|
@ -29,9 +29,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#endif
|
||||
|
||||
#ifdef macintosh
|
||||
/* The Macintosh main program is in macmain.c */
|
||||
/* The Macintosh main program is in either macapplet.c or macapplication.c */
|
||||
#define NO_MAIN
|
||||
char *fileargument; /* So main() can tell us the program name */
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
|
@ -42,7 +41,6 @@ char *fileargument; /* So main() can tell us the program name */
|
|||
#include "osdefs.h"
|
||||
#include "intrcheck.h"
|
||||
|
||||
char *PyMac_GetPythonDir();
|
||||
|
||||
#ifndef NO_MAIN
|
||||
|
||||
|
@ -168,12 +166,13 @@ getpythonpath()
|
|||
** - Prepend the python home-directory (which is obtained from a Preferences
|
||||
** resource)
|
||||
** - Add :
|
||||
** - Chdir to where the source file (if any) lives
|
||||
*/
|
||||
static char *pythonpath;
|
||||
char *curwd;
|
||||
char *p, *endp;
|
||||
int newlen;
|
||||
extern char *PyMac_GetPythonDir();
|
||||
extern char *PyMac_GetScriptPath();
|
||||
|
||||
if ( pythonpath ) return pythonpath;
|
||||
curwd = PyMac_GetPythonDir();
|
||||
|
@ -205,14 +204,6 @@ getpythonpath()
|
|||
pythonpath[newlen] = '\0';
|
||||
p = endp + 1;
|
||||
}
|
||||
if ( fileargument ) {
|
||||
strcpy(curwd, fileargument);
|
||||
endp = strrchr(curwd, ':');
|
||||
if ( endp && endp > curwd ) {
|
||||
*endp = '\0';
|
||||
chdir(curwd);
|
||||
}
|
||||
}
|
||||
return pythonpath;
|
||||
#else /* !macintosh */
|
||||
char *path = getenv("PYTHONPATH");
|
||||
|
@ -346,13 +337,17 @@ struct {
|
|||
{"mactcp", initmactcp},
|
||||
#endif
|
||||
{"AE", initAE},
|
||||
#ifndef __MWERKS__
|
||||
{"Ctl", initCtl},
|
||||
{"Dlg", initDlg},
|
||||
#endif
|
||||
{"Evt", initEvt},
|
||||
{"Menu", initMenu},
|
||||
#ifndef __MWERKS__
|
||||
{"Qd", initQd},
|
||||
{"Snd", initSnd},
|
||||
{"Win", initWin},
|
||||
#endif
|
||||
{"Res", initRes},
|
||||
|
||||
/* -- ADDMODULE MARKER 2 -- */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue