Removed (within an #ifdef) Carbon-incompatabilities:

- Don't call all the toolbox init routines.
- No balloon help, so removed help code from the initial dialog.

diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c
index 98c83238432ee52250488ccd7efd7927435d4c89..90d009379f187cb7c740b8bbf5e08fb22b7023e6 100644 (file)
--- a/Mac/Python/macmain.c
+++ b/Mac/Python/macmain.c
@@ -48,6 +48,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <profiler.h>
 #endif
 #endif
+#include <unistd.h>
 
 #ifdef THINK_C
 #include <console.h>
@@ -91,6 +92,8 @@ init_mac_world()
 #ifdef THINK_C
        printf("\n");
 #else
+#ifndef TARGET_API_MAC_CARBON
+       /* These aren't needed for carbon */
        MaxApplZone();
        InitGraf(&qd.thePort);
        InitFonts();
@@ -98,6 +101,7 @@ init_mac_world()
        TEInit();
        InitDialogs((long)0);
        InitMenus();
+#endif
        InitCursor();
        init_appearance();
 #endif
@@ -165,9 +169,11 @@ PyMac_InteractiveOptions(PyMac_PrefRecord *p, int *argcp, char ***argvp)
                        DisposeDialog(dialog);
                        exit(0);
                }
+#ifndef TARGET_API_MAC_CARBON
                if ( item == OPT_HELP ) {
                        HMSetBalloons(!HMGetBalloons());
                }
+#endif
                if ( item == OPT_CMDLINE ) {
                        int new_argc, newer_argc;
                        char **new_argv, **newer_argv;