[Python-checkins] python/dist/src/Mac/Python macmain.c,1.75,1.76

2002年4月11日 13:48:12 -0700

Update of /cvsroot/python/python/dist/src/Mac/Python
In directory usw-pr-cvs1:/tmp/cvs-serv9689/Python/Mac/Python
Modified Files:
	macmain.c 
Log Message:
Got rid of ifdefs for long-obsolete GUSI versions and other stuff that is now standard (appearance, interned strings)
Index: macmain.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Python/macmain.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** macmain.c	29 Mar 2002 14:43:50 -0000	1.75
--- macmain.c	11 Apr 2002 20:48:08 -0000	1.76
***************
*** 46,53 ****
 #include <CFArray.h>
 #endif /* TARGET_API_MAC_CARBON */
- #ifdef USE_APPEARANCE
 #include <Gestalt.h>
 #include <Appearance.h>
- #endif /* USE_APPEARANCE */
 #else
 #include <Carbon/Carbon.h>
--- 46,51 ----
***************
*** 92,110 ****
 void PyMac_Exit(int); /* Forward */
 
- static void init_appearance(void)
- {
- #ifdef USE_APPEARANCE
- 	OSErr err;
- 	SInt32 response;
- 
- 	err = Gestalt(gestaltAppearanceAttr,&response);
- 	if ( err ) goto no_appearance;
- 	if ( !(response&(1<<gestaltAppearanceExists)) ) goto no_appearance;
- 	/* XXXX Should we check the version? Compat-mode? */
- 	PyMac_AppearanceCompliant = 1;
- no_appearance:
- 	return;
- #endif /* USE_APPEARANCE */
- }
 /* Initialize the Mac toolbox world */
 
--- 90,93 ----
***************
*** 123,127 ****
 #endif
 	InitCursor();
- 	init_appearance();
 }
 
--- 106,109 ----
***************
*** 284,293 ****
 #endif
 
- #if defined(USE_GUSI1)
- 	/* Setup GUSI */
- 	GUSIDefaultSetup();
- 	PyMac_SetGUSISpin();
- 	PyMac_SetGUSIOptions();
- #endif
 #if defined(USE_GUSI)
 	atexit(PyMac_StopGUSISpin);
--- 266,269 ----
***************
*** 296,302 ****
 #ifdef USE_SIOUX
 	/* Set various SIOUX flags. Some are changed later based on options */
- #if 0
- 	SIOUXSettings.standalone = 0;	/* XXXX Attempting to keep sioux from eating events */
- #endif
 	SIOUXSettings.asktosaveonclose = 0;
 	SIOUXSettings.showstatusline = 0;
--- 272,275 ----
***************
*** 599,606 ****
 
 			chdir(curwd);
- #ifdef USE_GUSI1
- 			/* Change MacOS's idea of wd too */
- 			PyMac_FixGUSIcd();
- #endif
 		}
 		/* Check that the first argument is a text file */
--- 572,575 ----