summaryrefslogtreecommitdiffstats
path: root/win/tkWinFont.c
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-01-13 23:08:06 (GMT)
committernijtmans <nijtmans>2010-01-13 23:08:06 (GMT)
commit353d7693729fb7a45a35be7158fc4b94db079735 (patch)
tree1f472912658d183c50de332bc66a33540b44f060 /win/tkWinFont.c
parent15e42ed5b2cbc9b9a5802d75268d97f302ac23c0 (diff)
downloadtk-353d7693729fb7a45a35be7158fc4b94db079735.zip
tk-353d7693729fb7a45a35be7158fc4b94db079735.tar.gz
tk-353d7693729fb7a45a35be7158fc4b94db079735.tar.bz2
Eliminate tkpMenubuttonClass
make tkpButtonProcs CONST fix gcc warnings: missing initializer
Diffstat (limited to 'win/tkWinFont.c')
-rw-r--r--win/tkWinFont.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/win/tkWinFont.c b/win/tkWinFont.c
index 715228b..e5d7b82 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.48 2010/01/05 08:49:50 dkf Exp $
+ * RCS: @(#) $Id: tkWinFont.c,v 1.49 2010/01/13 23:08:12 nijtmans Exp $
*/
#include "tkWinInt.h"
@@ -2521,7 +2521,7 @@ GetScreenFont(
* We can only store up to LF_FACESIZE wide characters
*/
- if (Tcl_DStringLength(&ds) >= (LF_FACESIZE * sizeof(WCHAR))) {
+ if (Tcl_DStringLength(&ds) >= (int)(LF_FACESIZE * sizeof(WCHAR))) {
Tcl_DStringSetLength(&ds, LF_FACESIZE);
}
src = (Tcl_UniChar *) Tcl_DStringValue(&ds);
@@ -2808,7 +2808,7 @@ LoadFontRanges(
}
n = GetFontData(hdc, cmapKey, 0, &cmapTable, sizeof(cmapTable));
- if (n != GDI_ERROR) {
+ if (n != (int) GDI_ERROR) {
if (swapped) {
SwapShort(&cmapTable.numTables);
}