[Python-checkins] python/dist/src/Mac/Python macgetpath.c,1.25,1.26

[jackjansen@sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/Python
In directory usw-pr-cvs1:/tmp/cvs-serv9810/Python/Mac/Python

Modified Files:
	macgetpath.c 
Log Message:
Got rid of ifdefs for long-obsolete GUSI versions and other stuff that is now standard (appearance, interned strings)

Index: macgetpath.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Python/macgetpath.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** macgetpath.c	14 Dec 2001 22:57:34 -0000	1.25
--- macgetpath.c	11 Apr 2002 20:48:25 -0000	1.26
***************
*** 64,71 ****
  #include <Dialogs.h>
  
- #ifdef USE_GUSI1
- #include <GUSI.h>
- #endif
- 
  #ifndef USE_BUILTIN_PATH
  staticforward char *PyMac_GetPythonPath();
--- 64,67 ----
***************
*** 212,220 ****
  	prefrh = FSpOpenResFile(&dirspec, fsRdWrShPerm);
  	if ( prefrh < 0 ) {
- #if 0
- 		action = CautionAlert(NOPREFFILE_ID, NULL);
- 		if ( action == NOPREFFILE_NO )
- 			exit(1);
- #endif
  		FSpCreateResFile(&dirspec, 'Pyth', 'pref', 0);
  		prefrh = FSpOpenResFile(&dirspec, fsRdWrShPerm);
--- 208,211 ----
***************
*** 454,480 ****
  	UseResFile(oldrh);
  }
- 
- #ifdef USE_GUSI1
- void
- PyMac_SetGUSIOptions()
- {
- 	Handle h;
- 	short oldrh, prefrh = -1;
- 	
- 	oldrh = CurResFile();
- 	
- 	/* Try override from the application resource fork */
- 	UseResFile(PyMac_AppRefNum);
- 	h = Get1Resource('GU\267I', GUSIOPTIONSOVERRIDE_ID);
- 	UseResFile(oldrh);
- 	
- 	/* If that didn't work try nonoverride from anywhere */
- 	if ( h == NULL ) {
- 		prefrh = PyMac_OpenPrefFile();
- 		h = GetResource('GU\267I', GUSIOPTIONS_ID);
- 	}
- 	if ( h ) GUSILoadConfiguration(h);
-    	if ( prefrh != -1) CloseResFile(prefrh);
- 	UseResFile(oldrh);
- }
- #endif /* USE_GUSI1 */	
--- 445,446 ----