summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2016-02-16 18:21:09 (GMT)
committerdgp <dgp@users.sourceforge.net>2016-02-16 18:21:09 (GMT)
commitb8bdf8881b1e1ac7220d7a87a05248384426e326 (patch)
treebfb8ae8bf1edde5bb9423ccb0568bf91eec016a3 /generic
parent9e0da9a8a02dceebf16ed424cdef34ebcb6f3b5c (diff)
parent365dd709b8625b7b08f347f0c0122612c454b618 (diff)
downloadtk-b8bdf8881b1e1ac7220d7a87a05248384426e326.zip
tk-b8bdf8881b1e1ac7220d7a87a05248384426e326.tar.gz
tk-b8bdf8881b1e1ac7220d7a87a05248384426e326.tar.bz2
merge trunk
Diffstat (limited to 'generic')
-rw-r--r--generic/tkEvent.c6
-rw-r--r--generic/tkTextDisp.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index bcc6d98..95aeda1 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -2039,6 +2039,12 @@ TkFinalize(
{
ExitHandler *exitPtr;
+#if defined(_WIN32) && !defined(STATIC_BUILD)
+ if (!tclStubsPtr) {
+ return;
+ }
+#endif
+
Tcl_DeleteExitHandler(TkFinalize, NULL);
Tcl_MutexLock(&exitMutex);
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 7969091..1eea37d 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -1640,7 +1640,7 @@ LayoutDLine(
* Make one more pass over the line to recompute various things like its
* height, length, and total number of bytes. Also modify the x-locations
* of chunks to reflect justification. If we're not wrapping, I'm not sure
- * what is the best way to handle left and center justification: should
+ * what is the best way to handle right and center justification: should
* the total length, for purposes of justification, be (a) the window
* width, (b) the length of the longest line in the window, or (c) the
* length of the longest line in the text? (c) isn't available, (b) seems