Added pymactoolboxglue.c and changed the exported symbols having to do with this.

diff --git a/Mac/Build/PythonCore.exp b/Mac/Build/PythonCore.exp
index 3715c88c4d25566a541521034b116913b305edf0..ee15d8b2e249dd7f4b23ff2bf8043cb101a02ff9 100644 (file)
--- a/Mac/Build/PythonCore.exp
+++ b/Mac/Build/PythonCore.exp
@@ -22,6 +22,7 @@ __dt__15GUSISIOUXSocketFv             # GUSISIOUXSocket::~GUSISIOUXSocket()
 Initialize__15GUSISIOUXSocketFv                # GUSISIOUXSocket::Initialize()
 __ct__15GUSISIOUXSocketFv              # GUSISIOUXSocket::GUSISIOUXSocket()
 Instance__15GUSISIOUXSocketFv          # GUSISIOUXSocket::Instance()
+Py_FileSystemDefaultEncoding
 _PyBuiltin_Init
 _PyEval_SliceIndex
 PyEval_CallObjectWithKeywords
@@ -486,7 +487,10 @@ PyString_AsStringAndSize
 PyString_AsString
 PyString_Size
 PyString_AsEncodedString
+PyString_AsEncodedObject
 PyString_Encode
+PyString_AsDecodedString
+PyString_AsDecodedObject
 PyString_Decode
 PyString_FromString
 PyString_FromStringAndSize
@@ -683,20 +687,19 @@ _PyImport_Inittab
 CtlObj_chain
 Control_Type
 initCtl
-CtlObj_Convert
-CtlObj_New
+_CtlObj_Convert
+_CtlObj_New
 DlgObj_chain
 Dialog_Type
 initDlg
-DlgObj_ConvertToWindow
 DlgObj_Convert
 DlgObj_New
 DlgObj_WhichDialog
 MenuObj_chain
 Menu_Type
 initMenu
-MenuObj_Convert
-MenuObj_New
+_MenuObj_Convert
+_MenuObj_New
 GrafObj_chain
 GrafPort_Type
 BMObj_chain
@@ -704,19 +707,19 @@ BitMap_Type
 QDGlobalsAccess_Type
 initQd
 BMObj_NewCopied
-BMObj_Convert
-BMObj_New
-GrafObj_Convert
-GrafObj_New
-QdRGB_Convert
-QdRGB_New
+_BMObj_Convert
+_BMObj_New
+_GrafObj_Convert
+_GrafObj_New
+_QdRGB_Convert
+_QdRGB_New
 ResObj_chain
 Resource_Type
 initRes
-OptResObj_Convert
-OptResObj_New
-ResObj_Convert
-ResObj_New
+_OptResObj_Convert
+_OptResObj_New
+_ResObj_Convert
+_ResObj_New
 WinObj_chain
 Window_Type
 initWin
@@ -873,8 +876,8 @@ AEDesc_Type
 upp_GenericEventHandler
 upp_AEIdleProc
 initAE
-AEDesc_Convert
-AEDesc_New
+_AEDesc_Convert
+_AEDesc_New
 init_locale
 initEvt
 init_sre
@@ -885,8 +888,8 @@ dragglue_TrackingHandlerUPP
 dragglue_ReceiveHandlerUPP
 dragglue_SendDataUPP
 initDrag
-DragObj_Convert
-DragObj_New
+_DragObj_Convert
+_DragObj_New
 initxreadlines
 PyCell_Type
 PyCell_Set
@@ -899,6 +902,86 @@ PySeqIter_Type
 PyCallIter_Type
 PyCallIter_New
 PySeqIter_New
+PyMacGluePtr_AEDesc_New
+PyMacGluePtr_AEDesc_Convert
+PyMacGluePtr_CmpObj_New
+PyMacGluePtr_CmpObj_Convert
+PyMacGluePtr_CmpInstObj_New
+PyMacGluePtr_CmpInstObj_Convert
+PyMacGluePtr_CtlObj_New
+PyMacGluePtr_CtlObj_Convert
+PyMacGluePtr_DragObj_New
+PyMacGluePtr_DragObj_Convert
+PyMacGluePtr_ListObj_New
+PyMacGluePtr_ListObj_Convert
+PyMacGluePtr_MenuObj_New
+PyMacGluePtr_MenuObj_Convert
+PyMacGluePtr_GrafObj_New
+PyMacGluePtr_GrafObj_Convert
+PyMacGluePtr_BMObj_New
+PyMacGluePtr_BMObj_Convert
+PyMacGluePtr_QdRGB_New
+PyMacGluePtr_QdRGB_Convert
+PyMacGluePtr_GWorldObj_New
+PyMacGluePtr_GWorldObj_Convert
+PyMacGluePtr_TrackObj_New
+PyMacGluePtr_TrackObj_Convert
+PyMacGluePtr_MovieObj_New
+PyMacGluePtr_MovieObj_Convert
+PyMacGluePtr_MovieCtlObj_New
+PyMacGluePtr_MovieCtlObj_Convert
+PyMacGluePtr_TimeBaseObj_New
+PyMacGluePtr_TimeBaseObj_Convert
+PyMacGluePtr_UserDataObj_New
+PyMacGluePtr_UserDataObj_Convert
+PyMacGluePtr_MediaObj_New
+PyMacGluePtr_MediaObj_Convert
+PyMacGluePtr_ResObj_New
+PyMacGluePtr_ResObj_Convert
+PyMacGluePtr_OptResObj_New
+PyMacGluePtr_OptResObj_Convert
+PyMacGluePtr_TEObj_New
+PyMacGluePtr_TEObj_Convert
+TEObj_Convert
+TEObj_New
+OptResObj_Convert
+OptResObj_New
+ResObj_Convert
+ResObj_New
+MediaObj_Convert
+MediaObj_New
+UserDataObj_Convert
+UserDataObj_New
+TimeBaseObj_Convert
+TimeBaseObj_New
+MovieCtlObj_Convert
+MovieCtlObj_New
+MovieObj_Convert
+MovieObj_New
+TrackObj_Convert
+TrackObj_New
+GWorldObj_Convert
+GWorldObj_New
+QdRGB_Convert
+QdRGB_New
+BMObj_Convert
+BMObj_New
+GrafObj_Convert
+GrafObj_New
+MenuObj_Convert
+MenuObj_New
+ListObj_Convert
+ListObj_New
+DragObj_Convert
+DragObj_New
+CtlObj_Convert
+CtlObj_New
+CmpInstObj_Convert
+CmpInstObj_New
+CmpObj_Convert
+CmpObj_New
+AEDesc_Convert
+AEDesc_New
 GUSISetupConsoleStdio
 GUSIStdioFlush
 GUSIStdioClose

diff --git a/Mac/Build/PythonCore.mcp b/Mac/Build/PythonCore.mcp
index e2c18d7d14f12799080abdfd657929283e70ae63..e0a4a51769d1e19e6c0e7f2dc92ce3f9b3d2b658 100644 (file)
Binary files a/Mac/Build/PythonCore.mcp and b/Mac/Build/PythonCore.mcp differ

diff --git a/Mac/Build/PythonCoreCarbon.exp b/Mac/Build/PythonCoreCarbon.exp
index c9c1f5b726ccc769a99d5850bb945938de78dd12..4d336822ad65e38d8c92b58f915ce8359f7f6711 100644 (file)
--- a/Mac/Build/PythonCoreCarbon.exp
+++ b/Mac/Build/PythonCoreCarbon.exp
@@ -22,6 +22,7 @@ __dt__15GUSISIOUXSocketFv             # GUSISIOUXSocket::~GUSISIOUXSocket()
 Initialize__15GUSISIOUXSocketFv                # GUSISIOUXSocket::Initialize()
 __ct__15GUSISIOUXSocketFv              # GUSISIOUXSocket::GUSISIOUXSocket()
 Instance__15GUSISIOUXSocketFv          # GUSISIOUXSocket::Instance()
+Py_FileSystemDefaultEncoding
 _PyBuiltin_Init
 _PyEval_SliceIndex
 PyEval_CallObjectWithKeywords
@@ -486,7 +487,10 @@ PyString_AsStringAndSize
 PyString_AsString
 PyString_Size
 PyString_AsEncodedString
+PyString_AsEncodedObject
 PyString_Encode
+PyString_AsDecodedString
+PyString_AsDecodedObject
 PyString_Decode
 PyString_FromString
 PyString_FromStringAndSize
@@ -676,20 +680,19 @@ _PyImport_Inittab
 CtlObj_chain
 Control_Type
 initCtl
-CtlObj_Convert
-CtlObj_New
+_CtlObj_Convert
+_CtlObj_New
 DlgObj_chain
 Dialog_Type
 initDlg
-DlgObj_ConvertToWindow
 DlgObj_Convert
 DlgObj_New
 DlgObj_WhichDialog
 MenuObj_chain
 Menu_Type
 initMenu
-MenuObj_Convert
-MenuObj_New
+_MenuObj_Convert
+_MenuObj_New
 GrafObj_chain
 GrafPort_Type
 BMObj_chain
@@ -697,19 +700,19 @@ BitMap_Type
 QDGlobalsAccess_Type
 initQd
 BMObj_NewCopied
-BMObj_Convert
-BMObj_New
-GrafObj_Convert
-GrafObj_New
-QdRGB_Convert
-QdRGB_New
+_BMObj_Convert
+_BMObj_New
+_GrafObj_Convert
+_GrafObj_New
+_QdRGB_Convert
+_QdRGB_New
 ResObj_chain
 Resource_Type
 initRes
-OptResObj_Convert
-OptResObj_New
-ResObj_Convert
-ResObj_New
+_OptResObj_Convert
+_OptResObj_New
+_ResObj_Convert
+_ResObj_New
 WinObj_chain
 Window_Type
 initWin
@@ -866,8 +869,8 @@ AEDesc_Type
 upp_GenericEventHandler
 upp_AEIdleProc
 initAE
-AEDesc_Convert
-AEDesc_New
+_AEDesc_Convert
+_AEDesc_New
 init_locale
 initEvt
 init_sre
@@ -878,8 +881,8 @@ dragglue_TrackingHandlerUPP
 dragglue_ReceiveHandlerUPP
 dragglue_SendDataUPP
 initDrag
-DragObj_Convert
-DragObj_New
+_DragObj_Convert
+_DragObj_New
 initxreadlines
 PyCell_Type
 PyCell_Set
@@ -892,6 +895,86 @@ PySeqIter_Type
 PyCallIter_Type
 PyCallIter_New
 PySeqIter_New
+PyMacGluePtr_AEDesc_New
+PyMacGluePtr_AEDesc_Convert
+PyMacGluePtr_CmpObj_New
+PyMacGluePtr_CmpObj_Convert
+PyMacGluePtr_CmpInstObj_New
+PyMacGluePtr_CmpInstObj_Convert
+PyMacGluePtr_CtlObj_New
+PyMacGluePtr_CtlObj_Convert
+PyMacGluePtr_DragObj_New
+PyMacGluePtr_DragObj_Convert
+PyMacGluePtr_ListObj_New
+PyMacGluePtr_ListObj_Convert
+PyMacGluePtr_MenuObj_New
+PyMacGluePtr_MenuObj_Convert
+PyMacGluePtr_GrafObj_New
+PyMacGluePtr_GrafObj_Convert
+PyMacGluePtr_BMObj_New
+PyMacGluePtr_BMObj_Convert
+PyMacGluePtr_QdRGB_New
+PyMacGluePtr_QdRGB_Convert
+PyMacGluePtr_GWorldObj_New
+PyMacGluePtr_GWorldObj_Convert
+PyMacGluePtr_TrackObj_New
+PyMacGluePtr_TrackObj_Convert
+PyMacGluePtr_MovieObj_New
+PyMacGluePtr_MovieObj_Convert
+PyMacGluePtr_MovieCtlObj_New
+PyMacGluePtr_MovieCtlObj_Convert
+PyMacGluePtr_TimeBaseObj_New
+PyMacGluePtr_TimeBaseObj_Convert
+PyMacGluePtr_UserDataObj_New
+PyMacGluePtr_UserDataObj_Convert
+PyMacGluePtr_MediaObj_New
+PyMacGluePtr_MediaObj_Convert
+PyMacGluePtr_ResObj_New
+PyMacGluePtr_ResObj_Convert
+PyMacGluePtr_OptResObj_New
+PyMacGluePtr_OptResObj_Convert
+PyMacGluePtr_TEObj_New
+PyMacGluePtr_TEObj_Convert
+TEObj_Convert
+TEObj_New
+OptResObj_Convert
+OptResObj_New
+ResObj_Convert
+ResObj_New
+MediaObj_Convert
+MediaObj_New
+UserDataObj_Convert
+UserDataObj_New
+TimeBaseObj_Convert
+TimeBaseObj_New
+MovieCtlObj_Convert
+MovieCtlObj_New
+MovieObj_Convert
+MovieObj_New
+TrackObj_Convert
+TrackObj_New
+GWorldObj_Convert
+GWorldObj_New
+QdRGB_Convert
+QdRGB_New
+BMObj_Convert
+BMObj_New
+GrafObj_Convert
+GrafObj_New
+MenuObj_Convert
+MenuObj_New
+ListObj_Convert
+ListObj_New
+DragObj_Convert
+DragObj_New
+CtlObj_Convert
+CtlObj_New
+CmpInstObj_Convert
+CmpInstObj_New
+CmpObj_Convert
+CmpObj_New
+AEDesc_Convert
+AEDesc_New
 GUSISetupConsoleStdio
 GUSIStdioFlush
 GUSIStdioClose