diff options
| -rw-r--r-- | Include/pymactoolbox.h | 189 | ||||
| -rw-r--r-- | Python/mactoolboxglue.c | 505 | ||||
| -rwxr-xr-x | configure | 37 | ||||
| -rw-r--r-- | configure.in | 26 |
4 files changed, 1 insertions, 756 deletions
diff --git a/Include/pymactoolbox.h b/Include/pymactoolbox.h deleted file mode 100644 index 92799e9..0000000 --- a/Include/pymactoolbox.h +++ /dev/null @@ -1,189 +0,0 @@ -/* -** pymactoolbox.h - globals defined in mactoolboxglue.c -*/ -#ifndef Py_PYMACTOOLBOX_H -#define Py_PYMACTOOLBOX_H -#ifdef __cplusplus - extern "C" { -#endif - -#include <Carbon/Carbon.h> -#include <QuickTime/QuickTime.h> - -/* -** Helper routines for error codes and such. -*/ -char *PyMac_StrError(int); /* strerror with mac errors */ -extern PyObject *PyMac_OSErrException; /* Exception for OSErr */ -PyObject *PyMac_GetOSErrException(void); /* Initialize & return it */ -PyObject *PyErr_Mac(PyObject *, int); /* Exception with a mac error */ -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. -*/ -int PyMac_GetOSType(PyObject *, OSType *); /* argument parser for OSType */ -PyObject *PyMac_BuildOSType(OSType); /* Convert OSType to PyObject */ - -PyObject *PyMac_BuildNumVersion(NumVersion);/* Convert NumVersion to PyObject */ - -int PyMac_GetStr255(PyObject *, Str255); /* argument parser for Str255 */ -PyObject *PyMac_BuildStr255(Str255); /* Convert Str255 to PyObject */ -PyObject *PyMac_BuildOptStr255(Str255); /* Convert Str255 to PyObject, - NULL to None */ - -int PyMac_GetRect(PyObject *, Rect *); /* argument parser for Rect */ -PyObject *PyMac_BuildRect(Rect *); /* Convert Rect to PyObject */ - -int PyMac_GetPoint(PyObject *, Point *); /* argument parser for Point */ -PyObject *PyMac_BuildPoint(Point); /* Convert Point to PyObject */ - -int PyMac_GetEventRecord(PyObject *, EventRecord *); /* argument parser for - EventRecord */ -PyObject *PyMac_BuildEventRecord(EventRecord *); /* Convert EventRecord to - PyObject */ - -int PyMac_GetFixed(PyObject *, Fixed *); /* argument parser for Fixed */ -PyObject *PyMac_BuildFixed(Fixed); /* Convert Fixed to PyObject */ -int PyMac_Getwide(PyObject *, wide *); /* argument parser for wide */ -PyObject *PyMac_Buildwide(wide *); /* Convert wide to PyObject */ - -/* -** The rest of the routines are implemented by extension modules. If they are -** dynamically loaded mactoolboxglue will contain a stub implementation of the -** routine, which imports the module, whereupon the module's init routine will -** communicate the routine pointer back to the stub. -** If USE_TOOLBOX_OBJECT_GLUE is not defined there is no glue code, and the -** extension modules simply declare the routine. This is the case for static -** builds (and could be the case for MacPython CFM builds, because CFM extension -** modules can reference each other without problems). -*/ - -#ifdef USE_TOOLBOX_OBJECT_GLUE -/* -** These macros are used in the module init code. If we use toolbox object glue -** it sets the function pointer to point to the real function. -*/ -#define PyMac_INIT_TOOLBOX_OBJECT_NEW(object, rtn) { \ - extern PyObject *(*PyMacGluePtr_##rtn)(object); \ - PyMacGluePtr_##rtn = _##rtn; \ -} -#define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(object, rtn) { \ - extern int (*PyMacGluePtr_##rtn)(PyObject *, object *); \ - PyMacGluePtr_##rtn = _##rtn; \ -} -#else -/* -** If we don't use toolbox object glue the init macros are empty. Moreover, we define -** _xxx_New to be the same as xxx_New, and the code in mactoolboxglue isn't included. -*/ -#define PyMac_INIT_TOOLBOX_OBJECT_NEW(object, rtn) -#define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(object, rtn) -#endif /* USE_TOOLBOX_OBJECT_GLUE */ - -/* macfs exports */ -int PyMac_GetFSSpec(PyObject *, FSSpec *); /* argument parser for FSSpec */ -PyObject *PyMac_BuildFSSpec(FSSpec *); /* Convert FSSpec to PyObject */ - -int PyMac_GetFSRef(PyObject *, FSRef *); /* argument parser for FSRef */ -PyObject *PyMac_BuildFSRef(FSRef *); /* Convert FSRef to PyObject */ - -/* AE exports */ -extern PyObject *AEDesc_New(AppleEvent *); /* XXXX Why passed by address?? */ -extern PyObject *AEDesc_NewBorrowed(AppleEvent *); -extern int AEDesc_Convert(PyObject *, AppleEvent *); - -/* Cm exports */ -extern PyObject *CmpObj_New(Component); -extern int CmpObj_Convert(PyObject *, Component *); -extern PyObject *CmpInstObj_New(ComponentInstance); -extern int CmpInstObj_Convert(PyObject *, ComponentInstance *); - -/* Ctl exports */ -extern PyObject *CtlObj_New(ControlHandle); -extern int CtlObj_Convert(PyObject *, ControlHandle *); - -/* Dlg exports */ -extern PyObject *DlgObj_New(DialogPtr); -extern int DlgObj_Convert(PyObject *, DialogPtr *); -extern PyObject *DlgObj_WhichDialog(DialogPtr); - -/* Drag exports */ -extern PyObject *DragObj_New(DragReference); -extern int DragObj_Convert(PyObject *, DragReference *); - -/* List exports */ -extern PyObject *ListObj_New(ListHandle); -extern int ListObj_Convert(PyObject *, ListHandle *); - -/* Menu exports */ -extern PyObject *MenuObj_New(MenuHandle); -extern int MenuObj_Convert(PyObject *, MenuHandle *); - -/* Qd exports */ -extern PyObject *GrafObj_New(GrafPtr); -extern int GrafObj_Convert(PyObject *, GrafPtr *); -extern PyObject *BMObj_New(BitMapPtr); -extern int BMObj_Convert(PyObject *, BitMapPtr *); -extern PyObject *QdRGB_New(RGBColor *); -extern int QdRGB_Convert(PyObject *, RGBColor *); - -/* Qdoffs exports */ -extern PyObject *GWorldObj_New(GWorldPtr); -extern int GWorldObj_Convert(PyObject *, GWorldPtr *); - -/* Qt exports */ -extern PyObject *TrackObj_New(Track); -extern int TrackObj_Convert(PyObject *, Track *); -extern PyObject *MovieObj_New(Movie); -extern int MovieObj_Convert(PyObject *, Movie *); -extern PyObject *MovieCtlObj_New(MovieController); -extern int MovieCtlObj_Convert(PyObject *, MovieController *); -extern PyObject *TimeBaseObj_New(TimeBase); -extern int TimeBaseObj_Convert(PyObject *, TimeBase *); -extern PyObject *UserDataObj_New(UserData); -extern int UserDataObj_Convert(PyObject *, UserData *); -extern PyObject *MediaObj_New(Media); -extern int MediaObj_Convert(PyObject *, Media *); - -/* Res exports */ -extern PyObject *ResObj_New(Handle); -extern int ResObj_Convert(PyObject *, Handle *); -extern PyObject *OptResObj_New(Handle); -extern int OptResObj_Convert(PyObject *, Handle *); - -/* TE exports */ -extern PyObject *TEObj_New(TEHandle); -extern int TEObj_Convert(PyObject *, TEHandle *); - -/* Win exports */ -extern PyObject *WinObj_New(WindowPtr); -extern int WinObj_Convert(PyObject *, WindowPtr *); -extern PyObject *WinObj_WhichWindow(WindowPtr); - -/* CF exports */ -extern PyObject *CFObj_New(CFTypeRef); -extern int CFObj_Convert(PyObject *, CFTypeRef *); -extern PyObject *CFTypeRefObj_New(CFTypeRef); -extern int CFTypeRefObj_Convert(PyObject *, CFTypeRef *); -extern PyObject *CFStringRefObj_New(CFStringRef); -extern int CFStringRefObj_Convert(PyObject *, CFStringRef *); -extern PyObject *CFMutableStringRefObj_New(CFMutableStringRef); -extern int CFMutableStringRefObj_Convert(PyObject *, CFMutableStringRef *); -extern PyObject *CFArrayRefObj_New(CFArrayRef); -extern int CFArrayRefObj_Convert(PyObject *, CFArrayRef *); -extern PyObject *CFMutableArrayRefObj_New(CFMutableArrayRef); -extern int CFMutableArrayRefObj_Convert(PyObject *, CFMutableArrayRef *); -extern PyObject *CFDictionaryRefObj_New(CFDictionaryRef); -extern int CFDictionaryRefObj_Convert(PyObject *, CFDictionaryRef *); -extern PyObject *CFMutableDictionaryRefObj_New(CFMutableDictionaryRef); -extern int CFMutableDictionaryRefObj_Convert(PyObject *, CFMutableDictionaryRef *); -extern PyObject *CFURLRefObj_New(CFURLRef); -extern int CFURLRefObj_Convert(PyObject *, CFURLRef *); -extern int OptionalCFURLRefObj_Convert(PyObject *, CFURLRef *); - -#ifdef __cplusplus - } -#endif -#endif diff --git a/Python/mactoolboxglue.c b/Python/mactoolboxglue.c deleted file mode 100644 index bb1ebb1..0000000 --- a/Python/mactoolboxglue.c +++ /dev/null @@ -1,505 +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. - -******************************************************************/ - - -#include "Python.h" -#include "pymactoolbox.h" -#include <arpa/inet.h> /* for ntohl, htonl */ - - -/* Like strerror() but for Mac OS error numbers */ -char * -PyMac_StrError(int err) -{ - static char buf[256]; - PyObject *m; - PyObject *rv; - - m = PyImport_ImportModuleNoBlock("MacOS"); - if (!m) { - if (Py_VerboseFlag) - PyErr_Print(); - PyErr_Clear(); - rv = NULL; - } - else { - rv = PyObject_CallMethod(m, "GetErrorString", "i", err); - if (!rv) - PyErr_Clear(); - } - if (!rv) { - buf[0] = '\0'; - } - else { - char *input = PyString_AsString(rv); - if (!input) { - PyErr_Clear(); - buf[0] = '\0'; - } else { - strncpy(buf, input, sizeof(buf) - 1); - buf[sizeof(buf) - 1] = '\0'; - } - Py_DECREF(rv); - } - Py_XDECREF(m); - return buf; -} - -/* Exception object shared by all Mac specific modules for Mac OS errors */ -PyObject *PyMac_OSErrException; - -/* Initialize and return PyMac_OSErrException */ -PyObject * -PyMac_GetOSErrException(void) -{ - if (PyMac_OSErrException == NULL) - PyMac_OSErrException = PyErr_NewException("MacOS.Error", NULL, NULL); - return PyMac_OSErrException; -} - -/* Set a MAC-specific error from errno, and return NULL; return None if no error */ -PyObject * -PyErr_Mac(PyObject *eobj, int err) -{ - char *msg; - PyObject *v; - - if (err == 0 && !PyErr_Occurred()) { - Py_INCREF(Py_None); - return Py_None; - } - if (err == -1 && PyErr_Occurred()) - return NULL; - msg = PyMac_StrError(err); - v = Py_BuildValue("(is)", err, msg); - PyErr_SetObject(eobj, v); - Py_DECREF(v); - return NULL; -} - -/* Call PyErr_Mac with PyMac_OSErrException */ -PyObject * -PyMac_Error(OSErr err) -{ - return PyErr_Mac(PyMac_GetOSErrException(), err); -} - - -OSErr -PyMac_GetFullPathname(FSSpec *fss, char *path, int len) -{ - PyObject *fs, *exc; - PyObject *rv = NULL; - char *input; - OSErr err = noErr; - - *path = '\0'; - - fs = PyMac_BuildFSSpec(fss); - if (!fs) - goto error; - - rv = PyObject_CallMethod(fs, "as_pathname", ""); - if (!rv) - goto error; - - input = PyString_AsString(rv); - if (!input) - goto error; - - strncpy(path, input, len - 1); - path[len - 1] = '\0'; - - Py_XDECREF(rv); - Py_XDECREF(fs); - return err; - - error: - exc = PyErr_Occurred(); - if (exc && PyErr_GivenExceptionMatches(exc, - PyMac_GetOSErrException())) { - PyObject *args = PyObject_GetAttrString(exc, "args"); - if (args) { - char *ignore; - PyArg_ParseTuple(args, "is", &err, &ignore); - Py_XDECREF(args); - } - } - if (err == noErr) - err = -1; - PyErr_Clear(); - Py_XDECREF(rv); - Py_XDECREF(fs); - return err; -} - -/* Convert a 4-char string object argument to an OSType value */ -int -PyMac_GetOSType(PyObject *v, OSType *pr) -{ - uint32_t tmp; - const char *str; - int len; - if (PyUnicode_Check(v)) { - v = _PyUnicode_AsDefaultEncodedString(v, NULL); - if (v == NULL) - return 0; - } - if (PyString_Check(v)) { - str = PyString_AS_STRING(v); - len = PyString_GET_SIZE(v); - } - else if (PyBytes_Check(v)) { - str = PyBytes_AS_STRING(v); - len = PyBytes_GET_SIZE(v); - } - else { - PyErr_SetString(PyExc_TypeError, - "OSType arg must be string (of 4 chars)"); - return 0; - } - if (len != 4) { - PyErr_SetString(PyExc_TypeError, - "OSType arg must be (string of) 4 chars"); - return 0; - } - memcpy((char *)&tmp, str, 4); - *pr = (OSType)ntohl(tmp); - return 1; -} - -/* Convert an OSType value to a 4-char string object */ -PyObject * -PyMac_BuildOSType(OSType t) -{ - uint32_t tmp = htonl((uint32_t)t); - return PyString_FromStringAndSize((char *)&tmp, 4); -} - -/* Convert an NumVersion value to a 4-element tuple */ -PyObject * -PyMac_BuildNumVersion(NumVersion t) -{ - return Py_BuildValue("(hhhh)", t.majorRev, t.minorAndBugRev, t.stage, t.nonRelRev); -} - - -/* Convert a Python string object to a Str255 */ -int -PyMac_GetStr255(PyObject *v, Str255 pbuf) -{ - char *ptr; - Py_ssize_t len = 1000; - - if (PyUnicode_Check(v)) { - v = _PyUnicode_AsDefaultEncodedString(v, NULL); - if (v == NULL) - return 0; - } - if (PyString_Check(v)) { - ptr = PyString_AS_STRING(v); - len = PyString_GET_SIZE(v); - } - else if (PyBytes_Check(v)) { - ptr = PyBytes_AS_STRING(v); - len = PyBytes_GET_SIZE(v); - } - if (len > 255) { - PyErr_SetString(PyExc_TypeError, - "Str255 arg must be string/bytes of at most 255 chars"); - return 0; - } - pbuf[0] = len; - memcpy((char *)(pbuf+1), ptr, len); - return 1; -} - -/* Convert a Str255 to a Python string object */ -PyObject * -PyMac_BuildStr255(Str255 s) -{ - if ( s == NULL ) { - PyErr_SetString(PyExc_SystemError, "Str255 pointer is NULL"); - return NULL; - } - return PyString_FromStringAndSize((char *)&s[1], (int)s[0]); -} - -PyObject * -PyMac_BuildOptStr255(Str255 s) -{ - if ( s == NULL ) { - Py_INCREF(Py_None); - return Py_None; - } - return PyString_FromStringAndSize((char *)&s[1], (int)s[0]); -} - - - -/* Convert a Python object to a Rect. - The object must be a (left, top, right, bottom) tuple. - (This differs from the order in the struct but is consistent with - the arguments to SetRect(), and also with STDWIN). */ -int -PyMac_GetRect(PyObject *v, Rect *r) -{ - return PyArg_Parse(v, "(hhhh)", &r->left, &r->top, &r->right, &r->bottom); -} - -/* Convert a Rect to a Python object */ -PyObject * -PyMac_BuildRect(Rect *r) -{ - return Py_BuildValue("(hhhh)", r->left, r->top, r->right, r->bottom); -} - - -/* Convert a Python object to a Point. - The object must be a (h, v) tuple. - (This differs from the order in the struct but is consistent with - the arguments to SetPoint(), and also with STDWIN). */ -int -PyMac_GetPoint(PyObject *v, Point *p) -{ - return PyArg_Parse(v, "(hh)", &p->h, &p->v); -} - -/* Convert a Point to a Python object */ -PyObject * -PyMac_BuildPoint(Point p) -{ - return Py_BuildValue("(hh)", p.h, p.v); -} - - -/* Convert a Python object to an EventRecord. - The object must be a (what, message, when, (v, h), modifiers) tuple. */ -int -PyMac_GetEventRecord(PyObject *v, EventRecord *e) -{ - return PyArg_Parse(v, "(Hkk(hh)H)", - &e->what, - &e->message, - &e->when, - &e->where.h, - &e->where.v, - &e->modifiers); -} - -/* Convert a Rect to an EventRecord object */ -PyObject * -PyMac_BuildEventRecord(EventRecord *e) -{ - return Py_BuildValue("(hll(hh)h)", - e->what, - e->message, - e->when, - e->where.h, - e->where.v, - e->modifiers); -} - -/* Convert Python object to Fixed */ -int -PyMac_GetFixed(PyObject *v, Fixed *f) -{ - double d; - - if( !PyArg_Parse(v, "d", &d)) - return 0; - *f = (Fixed)(d * 0x10000); - return 1; -} - -/* Convert a Fixed to a Python object */ -PyObject * -PyMac_BuildFixed(Fixed f) -{ - double d; - - d = f; - d = d / 0x10000; - return Py_BuildValue("d", d); -} - -/* Convert wide to/from Python int or (hi, lo) tuple. XXXX Should use Python longs */ -int -PyMac_Getwide(PyObject *v, wide *rv) -{ - if (PyLong_Check(v)) { - rv->hi = 0; - rv->lo = PyLong_AsLong(v); - if( rv->lo & 0x80000000 ) - rv->hi = -1; - return 1; - } - return PyArg_Parse(v, "(kk)", &rv->hi, &rv->lo); -} - - -PyObject * -PyMac_Buildwide(wide *w) -{ - if ( (w->hi == 0 && (w->lo & 0x80000000) == 0) || - (w->hi == -1 && (w->lo & 0x80000000) ) ) - return PyLong_FromLong(w->lo); - return Py_BuildValue("(ll)", w->hi, w->lo); -} - -#ifdef USE_TOOLBOX_OBJECT_GLUE -/* -** Glue together the toolbox objects. -** -** Because toolbox modules interdepend on each other, they use each others -** object types, on MacOSX/MachO this leads to the situation that they -** cannot be dynamically loaded (or they would all have to be lumped into -** a single .so, but this would be bad for extensibility). -** -** This file defines wrappers for all the _New and _Convert functions, -** which are the Py_BuildValue and PyArg_ParseTuple helpers. The wrappers -** check an indirection function pointer, and if it isn't filled in yet -** they import the appropriate module, whose init routine should fill in -** the pointer. -*/ - -#define GLUE_NEW(object, routinename, module) \ -PyObject *(*PyMacGluePtr_##routinename)(object); \ -\ -PyObject *routinename(object cobj) { \ - if (!PyMacGluePtr_##routinename) { \ - if (!PyImport_ImportModule(module)) return NULL; \ - if (!PyMacGluePtr_##routinename) { \ - PyErr_SetString(PyExc_ImportError, "Module did not provide routine: " module ": " #routinename); \ - return NULL; \ - } \ - } \ - return (*PyMacGluePtr_##routinename)(cobj); \ -} - -#define GLUE_CONVERT(object, routinename, module) \ -int (*PyMacGluePtr_##routinename)(PyObject *, object *); \ -\ -int routinename(PyObject *pyobj, object *cobj) { \ - if (!PyMacGluePtr_##routinename) { \ - if (!PyImport_ImportModule(module)) return 0; \ - if (!PyMacGluePtr_##routinename) { \ - PyErr_SetString(PyExc_ImportError, "Module did not provide routine: " module ": " #routinename); \ - return 0; \ - } \ - } \ - return (*PyMacGluePtr_##routinename)(pyobj, cobj); \ -} - -GLUE_NEW(FSSpec *, PyMac_BuildFSSpec, "Carbon.File") -GLUE_CONVERT(FSSpec, PyMac_GetFSSpec, "Carbon.File") -GLUE_NEW(FSRef *, PyMac_BuildFSRef, "Carbon.File") -GLUE_CONVERT(FSRef, PyMac_GetFSRef, "Carbon.File") - -GLUE_NEW(AppleEvent *, AEDesc_New, "Carbon.AE") /* XXXX Why by address? */ -GLUE_NEW(AppleEvent *, AEDesc_NewBorrowed, "Carbon.AE") -GLUE_CONVERT(AppleEvent, AEDesc_Convert, "Carbon.AE") - -GLUE_NEW(Component, CmpObj_New, "Carbon.Cm") -GLUE_CONVERT(Component, CmpObj_Convert, "Carbon.Cm") -GLUE_NEW(ComponentInstance, CmpInstObj_New, "Carbon.Cm") -GLUE_CONVERT(ComponentInstance, CmpInstObj_Convert, "Carbon.Cm") - -GLUE_NEW(ControlHandle, CtlObj_New, "Carbon.Ctl") -GLUE_CONVERT(ControlHandle, CtlObj_Convert, "Carbon.Ctl") - -GLUE_NEW(DialogPtr, DlgObj_New, "Carbon.Dlg") -GLUE_CONVERT(DialogPtr, DlgObj_Convert, "Carbon.Dlg") -GLUE_NEW(DialogPtr, DlgObj_WhichDialog, "Carbon.Dlg") - -GLUE_NEW(DragReference, DragObj_New, "Carbon.Drag") -GLUE_CONVERT(DragReference, DragObj_Convert, "Carbon.Drag") - -GLUE_NEW(ListHandle, ListObj_New, "Carbon.List") -GLUE_CONVERT(ListHandle, ListObj_Convert, "Carbon.List") - -GLUE_NEW(MenuHandle, MenuObj_New, "Carbon.Menu") -GLUE_CONVERT(MenuHandle, MenuObj_Convert, "Carbon.Menu") - -GLUE_NEW(GrafPtr, GrafObj_New, "Carbon.Qd") -GLUE_CONVERT(GrafPtr, GrafObj_Convert, "Carbon.Qd") -GLUE_NEW(BitMapPtr, BMObj_New, "Carbon.Qd") -GLUE_CONVERT(BitMapPtr, BMObj_Convert, "Carbon.Qd") -GLUE_NEW(RGBColor *, QdRGB_New, "Carbon.Qd") /* XXXX Why? */ -GLUE_CONVERT(RGBColor, QdRGB_Convert, "Carbon.Qd") - -GLUE_NEW(GWorldPtr, GWorldObj_New, "Carbon.Qdoffs") -GLUE_CONVERT(GWorldPtr, GWorldObj_Convert, "Carbon.Qdoffs") - -GLUE_NEW(Track, TrackObj_New, "Carbon.Qt") -GLUE_CONVERT(Track, TrackObj_Convert, "Carbon.Qt") -GLUE_NEW(Movie, MovieObj_New, "Carbon.Qt") -GLUE_CONVERT(Movie, MovieObj_Convert, "Carbon.Qt") -GLUE_NEW(MovieController, MovieCtlObj_New, "Carbon.Qt") -GLUE_CONVERT(MovieController, MovieCtlObj_Convert, "Carbon.Qt") -GLUE_NEW(TimeBase, TimeBaseObj_New, "Carbon.Qt") -GLUE_CONVERT(TimeBase, TimeBaseObj_Convert, "Carbon.Qt") -GLUE_NEW(UserData, UserDataObj_New, "Carbon.Qt") -GLUE_CONVERT(UserData, UserDataObj_Convert, "Carbon.Qt") -GLUE_NEW(Media, MediaObj_New, "Carbon.Qt") -GLUE_CONVERT(Media, MediaObj_Convert, "Carbon.Qt") - -GLUE_NEW(Handle, ResObj_New, "Carbon.Res") -GLUE_CONVERT(Handle, ResObj_Convert, "Carbon.Res") -GLUE_NEW(Handle, OptResObj_New, "Carbon.Res") -GLUE_CONVERT(Handle, OptResObj_Convert, "Carbon.Res") - -GLUE_NEW(TEHandle, TEObj_New, "Carbon.TE") -GLUE_CONVERT(TEHandle, TEObj_Convert, "Carbon.TE") - -GLUE_NEW(WindowPtr, WinObj_New, "Carbon.Win") -GLUE_CONVERT(WindowPtr, WinObj_Convert, "Carbon.Win") -GLUE_NEW(WindowPtr, WinObj_WhichWindow, "Carbon.Win") - -GLUE_CONVERT(CFTypeRef, CFObj_Convert, "Carbon.CF") -GLUE_NEW(CFTypeRef, CFObj_New, "Carbon.CF") - -GLUE_CONVERT(CFTypeRef, CFTypeRefObj_Convert, "Carbon.CF") -GLUE_NEW(CFTypeRef, CFTypeRefObj_New, "Carbon.CF") - -GLUE_CONVERT(CFStringRef, CFStringRefObj_Convert, "Carbon.CF") -GLUE_NEW(CFStringRef, CFStringRefObj_New, "Carbon.CF") -GLUE_CONVERT(CFMutableStringRef, CFMutableStringRefObj_Convert, "Carbon.CF") -GLUE_NEW(CFMutableStringRef, CFMutableStringRefObj_New, "Carbon.CF") - -GLUE_CONVERT(CFArrayRef, CFArrayRefObj_Convert, "Carbon.CF") -GLUE_NEW(CFArrayRef, CFArrayRefObj_New, "Carbon.CF") -GLUE_CONVERT(CFMutableArrayRef, CFMutableArrayRefObj_Convert, "Carbon.CF") -GLUE_NEW(CFMutableArrayRef, CFMutableArrayRefObj_New, "Carbon.CF") - -GLUE_CONVERT(CFDictionaryRef, CFDictionaryRefObj_Convert, "Carbon.CF") -GLUE_NEW(CFDictionaryRef, CFDictionaryRefObj_New, "Carbon.CF") -GLUE_CONVERT(CFMutableDictionaryRef, CFMutableDictionaryRefObj_Convert, "Carbon.CF") -GLUE_NEW(CFMutableDictionaryRef, CFMutableDictionaryRefObj_New, "Carbon.CF") - -GLUE_CONVERT(CFURLRef, CFURLRefObj_Convert, "Carbon.CF") -GLUE_CONVERT(CFURLRef, OptionalCFURLRefObj_Convert, "Carbon.CF") -GLUE_NEW(CFURLRef, CFURLRefObj_New, "Carbon.CF") - -#endif /* USE_TOOLBOX_OBJECT_GLUE */ @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 62620 . +# From configure.in Revision: 62716 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for python 3.0. # @@ -1318,7 +1318,6 @@ Optional Features: Build (MacOSX|Darwin) framework --enable-shared disable/enable building shared python library --enable-profiling enable C-level code profiling - --enable-toolbox-glue disable/enable MacOSX glue code for extensions --enable-ipv6 Enable ipv6 (with ipv4) support --disable-ipv6 Disable ipv6 support @@ -12718,40 +12717,6 @@ _ACEOF fi CC="$ac_save_cc" -{ echo "$as_me:$LINENO: checking for --enable-toolbox-glue" >&5 -echo $ECHO_N "checking for --enable-toolbox-glue... $ECHO_C" >&6; } -# Check whether --enable-toolbox-glue was given. -if test "${enable_toolbox_glue+set}" = set; then - enableval=$enable_toolbox_glue; -fi - - -if test -z "$enable_toolbox_glue" -then - case $ac_sys_system/$ac_sys_release in - Darwin/*) - enable_toolbox_glue="yes";; - *) - enable_toolbox_glue="no";; - esac -fi -case "$enable_toolbox_glue" in -yes) - extra_machdep_objs="Python/mactoolboxglue.o" - extra_undefs="-u _PyMac_Error" - -cat >>confdefs.h <<\_ACEOF -#define USE_TOOLBOX_OBJECT_GLUE 1 -_ACEOF - - ;; -*) - extra_machdep_objs="" - extra_undefs="" - ;; -esac -{ echo "$as_me:$LINENO: result: $enable_toolbox_glue" >&5 -echo "${ECHO_T}$enable_toolbox_glue" >&6; } case $ac_sys_system/$ac_sys_release in diff --git a/configure.in b/configure.in index 2baf435..b749560 100644 --- a/configure.in +++ b/configure.in @@ -1352,32 +1352,6 @@ if test "$have_pthread_t" = yes ; then fi CC="$ac_save_cc" -AC_MSG_CHECKING(for --enable-toolbox-glue) -AC_ARG_ENABLE(toolbox-glue, - AC_HELP_STRING(--enable-toolbox-glue, disable/enable MacOSX glue code for extensions)) - -if test -z "$enable_toolbox_glue" -then - case $ac_sys_system/$ac_sys_release in - Darwin/*) - enable_toolbox_glue="yes";; - *) - enable_toolbox_glue="no";; - esac -fi -case "$enable_toolbox_glue" in -yes) - extra_machdep_objs="Python/mactoolboxglue.o" - extra_undefs="-u _PyMac_Error" - AC_DEFINE(USE_TOOLBOX_OBJECT_GLUE, 1, - [Define if you want to use MacPython modules on MacOSX in unix-Python.]) - ;; -*) - extra_machdep_objs="" - extra_undefs="" - ;; -esac -AC_MSG_RESULT($enable_toolbox_glue) AC_SUBST(OTHER_LIBTOOL_OPT) case $ac_sys_system/$ac_sys_release in |