diff options
| author | das <das> | 2009-06-29 14:35:01 (GMT) |
|---|---|---|
| committer | das <das> | 2009-06-29 14:35:01 (GMT) |
| commit | 8f9b8fd63b4da5f6f27b46c438c89f2baa15f0e8 (patch) | |
| tree | 81b5743d2ff5d45f2ee4992153e4f34949ea8f8a /macosx/tkMacOSXFont.h | |
| parent | e4a87c21cb59539eeddcc65d359e9b06d597fed3 (diff) | |
| download | tk-8f9b8fd63b4da5f6f27b46c438c89f2baa15f0e8.zip tk-8f9b8fd63b4da5f6f27b46c438c89f2baa15f0e8.tar.gz tk-8f9b8fd63b4da5f6f27b46c438c89f2baa15f0e8.tar.bz2 | |
Merge of TkAqua Cocoa portmacosx_cocoa_merge
Diffstat (limited to 'macosx/tkMacOSXFont.h')
| -rw-r--r-- | macosx/tkMacOSXFont.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/macosx/tkMacOSXFont.h b/macosx/tkMacOSXFont.h index 9c88409..6f63f2e 100644 --- a/macosx/tkMacOSXFont.h +++ b/macosx/tkMacOSXFont.h @@ -6,13 +6,13 @@ * * Copyright (c) 1990-1994 The Regents of the University of California. * Copyright (c) 1994-1997 Sun Microsystems, Inc. - * Copyright 2001, Apple Computer, Inc. - * Copyright (c) 2006-2007 Daniel A. Steffen <das@users.sourceforge.net> + * Copyright 2001-2009, Apple Inc. + * Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net> * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXFont.h,v 1.6 2008/12/10 05:02:52 das Exp $ + * RCS: @(#) $Id: tkMacOSXFont.h,v 1.7 2009/06/29 14:35:01 das Exp $ */ #ifndef TKMACOSXFONT_H @@ -28,13 +28,7 @@ * Function prototypes */ -MODULE_SCOPE void TkMacOSXInitControlFontStyle(Tk_Font tkfont, - ControlFontStylePtr fsPtr); -MODULE_SCOPE void TkMacOSXFMFontInfoForFont(Tk_Font tkfont, - FMFontFamily *fontFamilyPtr, FMFontStyle *fontStylePtr, - FMFontSize *fontSizePtr, ATSUStyle *fontATSUStylePtr); -MODULE_SCOPE Tcl_Obj * TkMacOSXFontDescriptionForFMFontInfo( - FMFontFamily fontFamily, FMFontStyle fontStyle, FMFontSize fontSize, - FMFont fontID); +MODULE_SCOPE Tcl_Obj * TkMacOSXFontDescriptionForNSFontAndNSFontAttributes( + NSFont *nsFont, NSDictionary *nsAttributes); #endif /*TKMACOSXFONT_H*/ |