diff options
author | wolfsuit <wolfsuit> | 2004-02-16 00:19:41 (GMT) |
---|---|---|
committer | wolfsuit <wolfsuit> | 2004-02-16 00:19:41 (GMT) |
commit | 0dc2e89b80549a1b01b88aa601b97a9430759b10 (patch) | |
tree | 367e94ab4e64d32b901564923e10633b826fd06c /macosx/tkMacOSXFont.c | |
parent | caf639e27f3647e678590382c2dd0739dba625a5 (diff) | |
download | tk-0dc2e89b80549a1b01b88aa601b97a9430759b10.zip tk-0dc2e89b80549a1b01b88aa601b97a9430759b10.tar.gz tk-0dc2e89b80549a1b01b88aa601b97a9430759b10.tar.bz2 |
Fix a bug in tk_getOpenFile - files with no types are rejected when they would
pass in Mac OS Classic.
Add the tkMacOSXCarbonEvents.c - just a skeleton right now.
A bunch of formatting nits fixed.
Diffstat (limited to 'macosx/tkMacOSXFont.c')
-rw-r--r-- | macosx/tkMacOSXFont.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c index 082e7b2..3d9ee87 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.4 2004/01/13 02:06:01 davygrvy Exp $ + * RCS: @(#) $Id: tkMacOSXFont.c,v 1.5 2004/02/16 00:19:42 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. @@ -2086,7 +2086,7 @@ GetUtfFaceName( return mapPtr->utfName; } } - Tcl_Panic("GetUtfFaceName: unexpected nativeName"); + panic("GetUtfFaceName: unexpected nativeName"); return NULL; } @@ -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 { |