diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2000-06-02 21:28:52 +0000 |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2000-06-02 21:28:52 +0000 |
| commit | b0bf7b3e03e27e243371b7447e48fb5257b8e4f2 (patch) | |
| tree | caf92c3708bd90d4af6b58c72931514e3d15146c /Mac/Python | |
| parent | 6b3d7216ae8d064870a86365130abd79048554f8 (diff) | |
| download | cpython-b0bf7b3e03e27e243371b7447e48fb5257b8e4f2.tar.gz | |
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.
Diffstat (limited to 'Mac/Python')
| -rw-r--r-- | Mac/Python/macmain.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c index 98c8323843..90d009379f 100644 --- 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; |