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.
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 initColorPicker();
extern void initPrinting();
extern void initDrag();
-extern void initNav();
#endif
#ifdef USE_CORE_TOOLBOX
extern void initCtl();
@@ -124,6 +123,7 @@
extern void initQd();
extern void initRes();
extern void initWin();
+extern void initNav();
#endif
#ifdef USE_QT
extern void initCm();
@@ -225,6 +225,7 @@
{"Ctl", initCtl},
{"Dlg", initDlg},
{"Menu", initMenu},
+ {"Nav", initNav},
{"Qd", initQd},
{"Win", initWin},
{"Res", initRes},
@@ -234,7 +235,6 @@
{"App", initApp},
{"Evt", initEvt},
{"Fm", initFm},
- {"Help", initHelp},
{"Icn", initIcn},
{"List", initList},
{"Snd", initSnd},
@@ -242,9 +242,11 @@
{"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 @@
/* Sentinel */
{0, 0}
};
-