[Python-checkins] python/dist/src/Python mactoolboxglue.c, 1.21, 1.22

[jackjansen at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Python
In directory sc8-pr-cvs1:/tmp/cvs-serv32109/Python

Modified Files:
	mactoolboxglue.c 
Log Message:
Getting rid of code conditional on TARGET_API_MAC_*.


Index: mactoolboxglue.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/mactoolboxglue.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** mactoolboxglue.c	19 Nov 2003 15:32:45 -0000	1.21
--- mactoolboxglue.c	19 Nov 2003 16:34:03 -0000	1.22
***************
*** 34,38 ****
  char *PyMac_getscript()
  {
- #if TARGET_API_MAC_OSX
      CFStringEncoding enc = CFStringGetSystemEncoding();
      static CFStringRef name = NULL;
--- 34,37 ----
***************
*** 51,84 ****
      }
      return (char *)CFStringGetCStringPtr(name, 0); 
- #else
-    int font, script, lang;
-     font = 0;
-     font = GetSysFont();
-     script = FontToScript(font);
-     switch (script) {
-     case smRoman:
-         lang = GetScriptVariable(script, smScriptLang);
-         if (lang == langIcelandic)
-             return "mac-iceland";
-         else if (lang == langTurkish)
-             return "mac-turkish";
-         else if (lang == langGreek)
-             return "mac-greek";
-         else
-             return "mac-roman";
-         break;
- #if 0
-     /* We don't have a codec for this, so don't return it */
-     case smJapanese:
-         return "mac-japan";
- #endif
-     case smGreek:
-         return "mac-greek";
-     case smCyrillic:
-         return "mac-cyrillic";
-     default:
-         return "ascii"; /* better than nothing */
-     }
- #endif /* TARGET_API_MAC_OSX */
  }
  
--- 50,53 ----
***************
*** 178,182 ****
  
  
- #if TARGET_API_MAC_OSX
  OSErr
  PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
--- 147,150 ----
***************
*** 216,220 ****
  }
  
- #endif /* TARGET_API_MAC_OSX */
  
  #ifdef WITH_NEXT_FRAMEWORK
--- 184,187 ----
***************
*** 233,241 ****
      int success = 0;
      
- #if TARGET_API_MAC_OSX
  	CFURLPathStyle thePathStyle = kCFURLPOSIXPathStyle;
- #else
- 	CFURLPathStyle thePathStyle = kCFURLHFSPathStyle;
- #endif
  
      /* Get a reference to our main bundle */
--- 200,204 ----