mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 19:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Getting rid of code conditional on TARGET_API_MAC_*.

Browse source
This commit is contained in:
Jack Jansen 2003-11-19 16:34:04 +00:00
parent 9588770e25
commit a53f4eba19
18 changed files with 2 additions and 748 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Python/mactoolboxglue.c
View file

@ -33,7 +33,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
char *PyMac_getscript()
{
#if TARGET_API_MAC_OSX
CFStringEncoding enc = CFStringGetSystemEncoding();
static CFStringRef name = NULL;
/* Return the code name for the encodings for which we have codecs. */
@ -50,36 +49,6 @@ char *PyMac_getscript()
name = CFStringConvertEncodingToIANACharSetName(enc);
}
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 */
}
/* Like strerror() but for Mac OS error numbers */
@ -177,7 +146,6 @@ PyMac_Error(OSErr err)
}
#if TARGET_API_MAC_OSX
OSErr
PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
{
@ -215,7 +183,6 @@ PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
return 0;
}
#endif /* TARGET_API_MAC_OSX */
#ifdef WITH_NEXT_FRAMEWORK
/*
@ -232,11 +199,7 @@ locateResourcePy(CFStringRef resourceType, CFStringRef resourceName, char *resou
CFArrayRef arrayRef = NULL;
int success = 0;
#if TARGET_API_MAC_OSX
CFURLPathStyle thePathStyle = kCFURLPOSIXPathStyle;
#else
CFURLPathStyle thePathStyle = kCFURLHFSPathStyle;
#endif
/* Get a reference to our main bundle */
mainBundle = CFBundleGetMainBundle();