diff options
| author | fvogel <fvogel@noemail.net> | 2016-03-01 17:36:13 (GMT) |
|---|---|---|
| committer | fvogel <fvogel@noemail.net> | 2016-03-01 17:36:13 (GMT) |
| commit | a00f0af5adebbb8b2a4662e9985d7f5c1dae4589 (patch) | |
| tree | 4bcc2aec4b290a2d192a84c65a7032d77f9c51cb /generic | |
| parent | f83d8c828966a51d878e95d948af057d742d1dd1 (diff) | |
| parent | fb23b5a7b6ee76e2732edda77fd0dbfeb6c7abbb (diff) | |
| download | tk-a00f0af5adebbb8b2a4662e9985d7f5c1dae4589.zip tk-a00f0af5adebbb8b2a4662e9985d7f5c1dae4589.tar.gz tk-a00f0af5adebbb8b2a4662e9985d7f5c1dae4589.tar.bz2 | |
trunk merged to branch tip-443
FossilOrigin-Name: d89f2e1b6baacdb7290b4c39b4f8952350f2f5ae
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tk.h | 4 | ||||
| -rw-r--r-- | generic/tkEvent.c | 6 | ||||
| -rw-r--r-- | generic/tkTextDisp.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/generic/tk.h b/generic/tk.h index 4a655a4..75d82ba 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -75,10 +75,10 @@ extern "C" { #define TK_MAJOR_VERSION 8 #define TK_MINOR_VERSION 6 #define TK_RELEASE_LEVEL TCL_FINAL_RELEASE -#define TK_RELEASE_SERIAL 4 +#define TK_RELEASE_SERIAL 5 #define TK_VERSION "8.6" -#define TK_PATCH_LEVEL "8.6.4" +#define TK_PATCH_LEVEL "8.6.5" /* * A special definition used to allow this header file to be included from 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 f871fc1..d22bcb3 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.c @@ -1727,7 +1727,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 |