summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tkFont.c13
-rw-r--r--win/Makefile.in1
2 files changed, 9 insertions, 5 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c
index 51b2fce..bec8807 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -13,7 +13,6 @@
#include "tkInt.h"
#include "tkFont.h"
-#include <windows.h>
/*
* The following structure is used to keep track of all the fonts that exist
@@ -1716,11 +1715,15 @@ Tk_PostscriptFontName(
upper = 1;
}
src += TkUtfToUniChar(src, &ch);
- if (upper) {
- ch = Tcl_UniCharToUpper(ch);
- upper = 0;
+ if (ch <= 0xffff) {
+ if (upper) {
+ ch = Tcl_UniCharToUpper(ch);
+ upper = 0;
+ } else {
+ ch = Tcl_UniCharToLower(ch);
+ }
} else {
- ch = Tcl_UniCharToLower(ch);
+ upper = 0;
}
dest += TkUniCharToUtf(ch, dest);
}
diff --git a/win/Makefile.in b/win/Makefile.in
index cc90b71..7e48213 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -27,6 +27,7 @@ exec_prefix = @exec_prefix@
bindir = @bindir@
libdir = @libdir@
includedir = @includedir@
+datarootdir = @datarootdir@
mandir = @mandir@
# The following definition can be set to non-null for special systems