summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXFont.c
diff options
context:
space:
mode:
authorwolfsuit <wolfsuit>2004-02-16 00:42:33 (GMT)
committerwolfsuit <wolfsuit>2004-02-16 00:42:33 (GMT)
commit304822dcdcdc1a1445448a983ff16a5e6c8b4fc5 (patch)
tree12bebf3e6d48b35ab147bf17d2c87861606f8460 /macosx/tkMacOSXFont.c
parent22f577bfa564c60c562e1e0720624585dbc69e30 (diff)
downloadtk-304822dcdcdc1a1445448a983ff16a5e6c8b4fc5.zip
tk-304822dcdcdc1a1445448a983ff16a5e6c8b4fc5.tar.gz
tk-304822dcdcdc1a1445448a983ff16a5e6c8b4fc5.tar.bz2
Backport Mac OS X specific fixes from TOT. See ChangeLog for details.
In tk_getOpenFile filters, handle the case where you have a Macintosh file type and the files have no filetype. Fix various formatting nits.
Diffstat (limited to 'macosx/tkMacOSXFont.c')
-rw-r--r--macosx/tkMacOSXFont.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index 1a6556c..875e1a3 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXFont.c,v 1.3 2002/10/16 19:44:05 das Exp $
+ * RCS: @(#) $Id: tkMacOSXFont.c,v 1.3.2.1 2004/02/16 00:42:34 wolfsuit Exp $
*/
#include <Carbon/Carbon.h>
@@ -1166,7 +1166,7 @@ TkMacOSXIsCharacterMissing(
fm.device = 0;
fm.numer.h = fm.numer.v = fm.denom.h = fm.denom.v = 1;
- fmOutPtr=FMSwapFont(&fm);
+ fmOutPtr = FMSwapFont(&fm);
fprintf(stderr,"fmOut %08x, handle %08x\n", (int)fmOutPtr, fmOutPtr->fontHandle);
#if !defined(UNIVERSAL_INTERFACES_VERSION) || (UNIVERSAL_INTERFACES_VERSION < 0x0300)
@@ -1749,13 +1749,13 @@ FontMapLoadPage(
* For some reason, FMSwapFont alywas returns a structure where the returned font handle
* is NULL. Until we figure this one out, assume all characters are allowed
*/
- fmOut=FMSwapFont(&fm);
- fHandle=fmOut->fontHandle;
- isMultiByteFont=subFontPtr->familyPtr->isMultiByteFont;
+ fmOut = FMSwapFont(&fm);
+ fHandle = fmOut->fontHandle;
+ isMultiByteFont = subFontPtr->familyPtr->isMultiByteFont;
#ifndef MAC_OSX_TK
GetResInfo(fHandle, &theID, &theType, theName);
fprintf ( stderr, "ResError() %d, %x\n", ResError (), fHandle );
- if (theType=='sfnt') {
+ if (theType == 'sfnt') {
#endif
/*
* Found an outline font which has very complex font record.
@@ -2241,7 +2241,7 @@ int TkMacOSXUseAntialiasedText(interp, enable)
static UInt32 (*swaptextflags)(UInt32) = NULL;
if(!initialized) {
- NSSymbol nsSymbol=NULL;
+ NSSymbol nsSymbol = NULL;
if(NSIsSymbolNameDefinedWithHint("_QDSwapTextFlags", "QD")) {
nsSymbol = NSLookupAndBindSymbolWithHint("_QDSwapTextFlags", "QD");
} else if(NSIsSymbolNameDefinedWithHint("_SwapQDTextFlags", "QD")) {
@@ -2267,9 +2267,9 @@ int TkMacOSXUseAntialiasedText(interp, enable)
Tcl_ResetResult(interp);
}
}
- if(swaptextflags) {
+ if (swaptextflags) {
swaptextflags(enable ? kQDUseCGTextRendering | kQDUseCGTextMetrics
- : kQDUseTrueTypeScalerGlyphs);
+ : kQDUseTrueTypeScalerGlyphs);
TkMacOSXAntialiasedTextEnabled = enable;
return TCL_OK;
} else {