diff options
| author | nijtmans <nijtmans> | 2010-04-29 15:28:04 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-04-29 15:28:04 (GMT) |
| commit | b36ef0e6d25a1a247dab7d8d39cc8f4242df1450 (patch) | |
| tree | 82bad50df8f16a12bb06512831f4ee71e21981ce /win/tkWinFont.c | |
| parent | bcca65eae4c1a94002d5f9aa9bd7fb75dc48b0fa (diff) | |
| download | tk-b36ef0e6d25a1a247dab7d8d39cc8f4242df1450.zip tk-b36ef0e6d25a1a247dab7d8d39cc8f4242df1450.tar.gz tk-b36ef0e6d25a1a247dab7d8d39cc8f4242df1450.tar.bz2 | |
Unnessarary TCL_STORAGE_CLASS re-definitions
Make various functions MODULE_SCOPE
TCHAR-related fixes, making al those
files compile fine when TCHAR != char.
Diffstat (limited to 'win/tkWinFont.c')
| -rw-r--r-- | win/tkWinFont.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/win/tkWinFont.c b/win/tkWinFont.c index e5d7b82..1914a92 100644 --- a/win/tkWinFont.c +++ b/win/tkWinFont.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: tkWinFont.c,v 1.49 2010/01/13 23:08:12 nijtmans Exp $ + * RCS: @(#) $Id: tkWinFont.c,v 1.50 2010/04/29 15:28:04 nijtmans Exp $ */ #include "tkWinInt.h" @@ -342,7 +342,7 @@ CreateNamedSystemLogFont( Tcl_Interp *interp, Tk_Window tkwin, const char* name, - LOGFONTA* logFontPtr) + LOGFONT* logFontPtr) { HFONT hFont; int r; @@ -455,9 +455,9 @@ TkWinSetupSystemFonts( */ { - LOGFONTA lfFixed = { + LOGFONT lfFixed = { 0, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, "" + 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, TEXT("") }; long pointSize, dpi; HDC hdc = GetDC(NULL); @@ -680,7 +680,7 @@ WinFontFamilyEnumProc( int fontType, /* Type of font (not used). */ LPARAM lParam) /* Result object to hold result. */ { - char *faceName = lfPtr->elfLogFont.lfFaceName; + TCHAR *faceName = lfPtr->elfLogFont.lfFaceName; Tcl_Obj *resultObj = (Tcl_Obj *) lParam; Tcl_DString faceString; |