mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Ported the icglue module to carbon.

Browse source
This commit is contained in:
Jack Jansen 2001-01-29 13:27:46 +00:00
parent 13735e3e3e
commit 5a8115c94b
5 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mac/Lib/ic.py
View file

@ -162,7 +162,8 @@ class IC:
self.ic = ic self.ic = ic
else: else:
self.ic = icglue.ICStart(signature) self.ic = icglue.ICStart(signature)
self.ic.ICFindConfigFile() if hasattr(self.ic, 'ICFindConfigFile'):
self.ic.ICFindConfigFile()
self.h = Res.Resource('') self.h = Res.Resource('')
def keys(self): def keys(self):

6
Mac/Modules/icgluemodule.c
View file

@ -69,6 +69,7 @@ staticforward PyTypeObject Icitype;
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
#if !TARGET_API_MAC_CARBON
static char ici_ICFindConfigFile__doc__[] = static char ici_ICFindConfigFile__doc__[] =
"()->None; Find config file in standard places" "()->None; Find config file in standard places"
; ;
@ -128,6 +129,7 @@ ici_ICChooseConfig(self, args)
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
} }
#endif /* !TARGET_API_MAC_CARBON */
static char ici_ICChooseNewConfig__doc__[] = static char ici_ICChooseNewConfig__doc__[] =
@ -458,10 +460,12 @@ ici_ICMapTypeCreator(self, args)
static struct PyMethodDef ici_methods[] = { static struct PyMethodDef ici_methods[] = {
{"ICFindConfigFile", (PyCFunction)ici_ICFindConfigFile, METH_VARARGS, ici_ICFindConfigFile__doc__}, #if !TARGET_API_MAC_CARBON
{"ICFindConfigFile", (PyCFunction)ici_ICFindConfigFile, METH_VARARGS, ici_ICFindConfigFile__doc__},
{"ICFindUserConfigFile", (PyCFunction)ici_ICFindUserConfigFile, METH_VARARGS, ici_ICFindUserConfigFile__doc__}, {"ICFindUserConfigFile", (PyCFunction)ici_ICFindUserConfigFile, METH_VARARGS, ici_ICFindUserConfigFile__doc__},
{"ICChooseConfig", (PyCFunction)ici_ICChooseConfig, METH_VARARGS, ici_ICChooseConfig__doc__}, {"ICChooseConfig", (PyCFunction)ici_ICChooseConfig, METH_VARARGS, ici_ICChooseConfig__doc__},
{"ICChooseNewConfig", (PyCFunction)ici_ICChooseNewConfig, METH_VARARGS, ici_ICChooseNewConfig__doc__}, {"ICChooseNewConfig", (PyCFunction)ici_ICChooseNewConfig, METH_VARARGS, ici_ICChooseNewConfig__doc__},
#endif /* !TARGET_API_MAC_CARBON */
{"ICGetSeed", (PyCFunction)ici_ICGetSeed, METH_VARARGS, ici_ICGetSeed__doc__}, {"ICGetSeed", (PyCFunction)ici_ICGetSeed, METH_VARARGS, ici_ICGetSeed__doc__},
{"ICBegin", (PyCFunction)ici_ICBegin, METH_VARARGS, ici_ICBegin__doc__}, {"ICBegin", (PyCFunction)ici_ICBegin, METH_VARARGS, ici_ICBegin__doc__},
{"ICFindPrefHandle", (PyCFunction)ici_ICFindPrefHandle, METH_VARARGS, ici_ICFindPrefHandle__doc__}, {"ICFindPrefHandle", (PyCFunction)ici_ICFindPrefHandle, METH_VARARGS, ici_ICFindPrefHandle__doc__},

2
Mac/mwerks/mwerks_nscarbon_config.h
View file

@ -29,7 +29,7 @@
/* #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */ /* #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */
#define USE_GDBM /* Include the gdbm module */ #define USE_GDBM /* Include the gdbm module */
#define USE_ZLIB /* Include the zlib module */ #define USE_ZLIB /* Include the zlib module */
/* #define USE_IC /* Include Internet Config module */ #define USE_IC /* Include Internet Config module */
#define USE_PYEXPAT /* Include Pyexpat module */ #define USE_PYEXPAT /* Include Pyexpat module */
#define USE_APPEARANCE /* Enable Appearance support */ #define USE_APPEARANCE /* Enable Appearance support */
#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */

2
Mac/scripts/fullbuild.py
View file

@ -249,7 +249,7 @@ I_CARBON_PLUGINS : (buildmwproject, "CWIE", [
(":Mac:Build:pyexpat.carbon.mcp", "pyexpat.carbon"), (":Mac:Build:pyexpat.carbon.mcp", "pyexpat.carbon"),
(":Mac:Build:calldll.carbon.mcp", "calldll.carbon"), (":Mac:Build:calldll.carbon.mcp", "calldll.carbon"),
(":Mac:Build:gdbm.carbon.mcp", "gdbm.carbon"), (":Mac:Build:gdbm.carbon.mcp", "gdbm.carbon"),
## (":Mac:Build:icglue.carbon.mcp", "icglue.carbon"), (":Mac:Build:icglue.carbon.mcp", "icglue.carbon"),
(":Mac:Build:waste.carbon.mcp", "waste.carbon"), (":Mac:Build:waste.carbon.mcp", "waste.carbon"),
(":Mac:Build:zlib.carbon.mcp", "zlib.carbon"), (":Mac:Build:zlib.carbon.mcp", "zlib.carbon"),
## (":Mac:Build:_tkinter.mcp", "_tkinter.carbon"), ## (":Mac:Build:_tkinter.mcp", "_tkinter.carbon"),

2
Mac/scripts/genpluginprojects.py
View file

@ -174,6 +174,8 @@ def genallprojects(force=0):
genpluginproject("ppc", "icglue", sources=["icgluemodule.c"], genpluginproject("ppc", "icglue", sources=["icgluemodule.c"],
libraries=["ICGlueCFM-PPC.lib"], libraries=["ICGlueCFM-PPC.lib"],
extradirs=["::::ICProgKit1.4:APIs"]) extradirs=["::::ICProgKit1.4:APIs"])
genpluginproject("carbon", "icglue", sources=["icgluemodule.c"],
extradirs=["::::ICProgKit1.4:APIs"])
genpluginproject("ppc", "macspeech", libraries=["SpeechLib"]) genpluginproject("ppc", "macspeech", libraries=["SpeechLib"])
if __name__ == '__main__': if __name__ == '__main__':