diff options
author | Jack Jansen <jack.jansen@cwi.nl> | 2000-06-02 21:35:07 (GMT) |
---|---|---|
committer | Jack Jansen <jack.jansen@cwi.nl> | 2000-06-02 21:35:07 (GMT) |
commit | e79dc76f53dfa18fb08c35f71b049259642c0142 (patch) | |
tree | 2d9cc6228cc713336a01d9ff09571eacff3a2ba0 /Mac/Modules/macconfig.c | |
parent | 33d1ad28cba273b94c70ffc22deb6c53b0c1b068 (diff) | |
download | cpython-e79dc76f53dfa18fb08c35f71b049259642c0142.zip cpython-e79dc76f53dfa18fb08c35f71b049259642c0142.tar.gz cpython-e79dc76f53dfa18fb08c35f71b049259642c0142.tar.bz2 |
Made the core toolbox modules carbon-compatible using the new greylist feature of bgen: non-carbon methods are still included in non-carbon MacPython. The issue of backward compatibility of Python code is still open.
Macmodule and macosmodule have also been carbonified. Some functionality is still missing there.
Diffstat (limited to 'Mac/Modules/macconfig.c')
-rw-r--r-- | Mac/Modules/macconfig.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Mac/Modules/macconfig.c b/Mac/Modules/macconfig.c index 5306764..9dc15c0 100644 --- a/Mac/Modules/macconfig.c +++ b/Mac/Modules/macconfig.c @@ -115,7 +115,6 @@ extern void initTE(); extern void initColorPicker(); extern void initPrinting(); extern void initDrag(); -extern void initNav(); #endif #ifdef USE_CORE_TOOLBOX extern void initCtl(); @@ -124,6 +123,7 @@ extern void initMenu(); extern void initQd(); extern void initRes(); extern void initWin(); +extern void initNav(); #endif #ifdef USE_QT extern void initCm(); @@ -225,6 +225,7 @@ struct _inittab _PyImport_Inittab[] = { {"Ctl", initCtl}, {"Dlg", initDlg}, {"Menu", initMenu}, + {"Nav", initNav}, {"Qd", initQd}, {"Win", initWin}, {"Res", initRes}, @@ -234,7 +235,6 @@ struct _inittab _PyImport_Inittab[] = { {"App", initApp}, {"Evt", initEvt}, {"Fm", initFm}, - {"Help", initHelp}, {"Icn", initIcn}, {"List", initList}, {"Snd", initSnd}, @@ -242,9 +242,11 @@ struct _inittab _PyImport_Inittab[] = { {"Scrap", initScrap}, {"TE", initTE}, {"ColorPicker", initColorPicker}, +#ifndef TARGET_API_MAC_CARBON + {"Help", initHelp}, {"Printing", initPrinting}, +#endif {"Drag", initDrag}, - {"Nav", initNav}, #endif #ifdef USE_QT {"Cm", initCm}, @@ -302,4 +304,3 @@ struct _inittab _PyImport_Inittab[] = { /* Sentinel */ {0, 0} }; - |