diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-24 11:52:02 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-24 11:52:02 (GMT) |
| commit | 93a3e63b7e9a22f94f1101b7ba32ac79738e5b65 (patch) | |
| tree | a0bd8e0aab1fdb02c452d5c3eeeeb29c2af519c3 /win/tkWinFont.c | |
| parent | 14ffbbfd3279791bcc99fd50066d6821e92cc5f9 (diff) | |
| download | tk-93a3e63b7e9a22f94f1101b7ba32ac79738e5b65.zip tk-93a3e63b7e9a22f94f1101b7ba32ac79738e5b65.tar.gz tk-93a3e63b7e9a22f94f1101b7ba32ac79738e5b65.tar.bz2 | |
Add type-casts to many usage of Tcl_WinTCharToUtf(), so Tk compiles without warnings when omitting -DUNICODE.
Diffstat (limited to 'win/tkWinFont.c')
| -rw-r--r-- | win/tkWinFont.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win/tkWinFont.c b/win/tkWinFont.c index bcac5c5..321ecc4 100644 --- a/win/tkWinFont.c +++ b/win/tkWinFont.c @@ -660,7 +660,7 @@ WinFontFamilyEnumProc( Tcl_Obj *resultObj = (Tcl_Obj *) lParam; Tcl_DString faceString; - Tcl_WinTCharToUtf(lfPtr->elfLogFont.lfFaceName, -1, &faceString); + Tcl_WinTCharToUtf((LPCTSTR)lfPtr->elfLogFont.lfFaceName, -1, &faceString); Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewStringObj( Tcl_DStringValue(&faceString), Tcl_DStringLength(&faceString))); Tcl_DStringFree(&faceString); @@ -1567,7 +1567,7 @@ InitFont( GetTextMetricsW(hdc, &tm); GetTextFaceW(hdc, LF_FACESIZE, buf); - Tcl_WinTCharToUtf(buf, -1, &faceString); + Tcl_WinTCharToUtf((LPCTSTR)buf, -1, &faceString); fontPtr->font.fid = (Font) fontPtr; fontPtr->hwnd = hwnd; @@ -1744,7 +1744,7 @@ AllocFontFamily( hFont = SelectObject(hdc, hFont); GetTextFaceW(hdc, LF_FACESIZE, buf); - Tcl_WinTCharToUtf(buf, -1, &faceString); + Tcl_WinTCharToUtf((LPCTSTR)buf, -1, &faceString); faceName = Tk_GetUid(Tcl_DStringValue(&faceString)); Tcl_DStringFree(&faceString); hFont = SelectObject(hdc, hFont); @@ -2047,7 +2047,7 @@ WinFontCanUseProc( fontPtr = canUsePtr->fontPtr; nameTriedPtr = canUsePtr->nameTriedPtr; - fallbackName = Tcl_WinTCharToUtf(lfPtr->elfLogFont.lfFaceName, -1, &faceString); + fallbackName = Tcl_WinTCharToUtf((LPCTSTR)lfPtr->elfLogFont.lfFaceName, -1, &faceString); if (SeenName(fallbackName, nameTriedPtr) == 0) { subFontPtr = CanUseFallback(hdc, fontPtr, fallbackName, ch, |