summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-09-27 15:50:44 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-09-27 15:50:44 (GMT)
commitaf17312e4d83e5ea367efbed4baf6fa32a067aa4 (patch)
tree86af9ee2224609b4e01f671a9c028ffb75cbc036 /win
parent8982d2a60381e8ad4eb9305272f572d939a5d097 (diff)
parent9fd7a0895dc0c93d3796ad72eccdc631d21f54ac (diff)
downloadtk-af17312e4d83e5ea367efbed4baf6fa32a067aa4.zip
tk-af17312e4d83e5ea367efbed4baf6fa32a067aa4.tar.gz
tk-af17312e4d83e5ea367efbed4baf6fa32a067aa4.tar.bz2
merge core-8-6-branch, keep FONTMAP_SHIFT to the original value.
Diffstat (limited to 'win')
-rw-r--r--win/tkWinFont.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/win/tkWinFont.c b/win/tkWinFont.c
index 7c6c0ba..43c4834 100644
--- a/win/tkWinFont.c
+++ b/win/tkWinFont.c
@@ -26,8 +26,9 @@
* Under Windows, a "font family" is uniquely identified by its face name.
*/
-#define FONTMAP_SHIFT 12
-#define FONTMAP_PAGES (1 << (21 - FONTMAP_SHIFT))
+#define FONTMAP_SHIFT 10
+
+#define FONTMAP_PAGES (1 << (sizeof(Tcl_UniChar)*8 - FONTMAP_SHIFT))
#define FONTMAP_BITSPERPAGE (1 << FONTMAP_SHIFT)
typedef struct FontFamily {