summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-18 12:19:10 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-18 12:19:10 (GMT)
commit87d12d1ccc63df37fd805599bf29388c1d164e36 (patch)
tree3f3352b166163e06c4fa6d647bc34651c34bc1a1 /win
parentbb089fa3ae014082fd1642a5c932f8c0c7422924 (diff)
parent6409149a9a89dbed7c247ed2b0e7e4317277da4a (diff)
downloadtk-87d12d1ccc63df37fd805599bf29388c1d164e36.zip
tk-87d12d1ccc63df37fd805599bf29388c1d164e36.tar.gz
tk-87d12d1ccc63df37fd805599bf29388c1d164e36.tar.bz2
merge trunk.
Make "font actual" return integers, for compatibility.
Diffstat (limited to 'win')
-rw-r--r--win/tkWinDialog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index 62400bb..5be6776 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -2808,7 +2808,7 @@ Tk_MessageBoxObjCmd(
ThreadSpecificData *tsdPtr =
Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
Tcl_DString titleBuf, tmpBuf;
- WCHAR *titlePtr, *tmpPtr;
+ const WCHAR *titlePtr, *tmpPtr;
const char *src;
defaultBtn = -1;