diff options
| author | hobbs <hobbs> | 1999-12-16 21:59:35 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 1999-12-16 21:59:35 (GMT) |
| commit | 3bbf2a103c03c7c5f318598f0f8df4576a4872db (patch) | |
| tree | 430ef5d08bf9e4fa76ad95f77476a11e1130e693 /win/tkWinFont.c | |
| parent | c9a242023cdce14e45cb94330e1800c7e864e4c2 (diff) | |
| download | tk-3bbf2a103c03c7c5f318598f0f8df4576a4872db.zip tk-3bbf2a103c03c7c5f318598f0f8df4576a4872db.tar.gz tk-3bbf2a103c03c7c5f318598f0f8df4576a4872db.tar.bz2 | |
* win/tkWinCursor.c: added support for Windows cursors to
TkGetCursorByName (.ani, .cur) using -cursor @<filename>
(Ascher) [Bug: 1350]
* win/tkWinWm.c: fixed 'wm deiconify' to update position of the
toplevel if event is waiting before mapping. (Mao) [Bug: 3687]
This removes the need for 'update idle' before 'wm deiconify' on
Windows.
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 7680b97..74c9739 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.5 1999/04/16 01:51:51 stanton Exp $ + * RCS: @(#) $Id: tkWinFont.c,v 1.6 1999/12/16 21:59:35 hobbs Exp $ */ #include "tkWinInt.h" @@ -657,7 +657,7 @@ Tk_MeasureChars( p - source, &runString); (*familyPtr->getTextExtentPoint32Proc)(hdc, Tcl_DStringValue(&runString), - Tcl_DStringLength(&runString) >> familyPtr->isWideFont, + Tcl_DStringLength(&runString) >> familyPtr->isWideFont, &size); curX += size.cx; Tcl_DStringFree(&runString); @@ -685,7 +685,7 @@ Tk_MeasureChars( FontFamily *familyPtr; SubFont *thisSubFontPtr; CONST char *term, *end, *p, *next; - int newX, termX, sawNonSpace, srcRead, dstWrote; + int newX, termX, sawNonSpace, dstWrote; /* * How many chars will fit in the space allotted? @@ -717,7 +717,7 @@ Tk_MeasureChars( } familyPtr = lastSubFontPtr->familyPtr; Tcl_UtfToExternal(NULL, familyPtr->encoding, p, next - p, - 0, NULL, buf, sizeof(buf), &srcRead, &dstWrote, NULL); + 0, NULL, buf, sizeof(buf), NULL, &dstWrote, NULL); (*familyPtr->getTextExtentPoint32Proc)(hdc, buf, dstWrote >> familyPtr->isWideFont, &size); newX += size.cx; |