diff options
| author | donal.k.fellows@manchester.ac.uk <dkf> | 2012-08-08 10:56:04 (GMT) |
|---|---|---|
| committer | donal.k.fellows@manchester.ac.uk <dkf> | 2012-08-08 10:56:04 (GMT) |
| commit | f077000f30227dad67825831d5684e3b6a8f59cf (patch) | |
| tree | 1e832456672c8f3df4fbfe96b51e7d9c06f73427 /generic | |
| parent | f8c668072186d0a9614541ebb186f6516179bd5a (diff) | |
| parent | 5efd82ddccb00c7c13703ab7923f1bb22f80bba4 (diff) | |
| download | tk-f077000f30227dad67825831d5684e3b6a8f59cf.zip tk-f077000f30227dad67825831d5684e3b6a8f59cf.tar.gz tk-f077000f30227dad67825831d5684e3b6a8f59cf.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkConfig.c | 5 | ||||
| -rw-r--r-- | generic/tkMain.c | 7 | ||||
| -rw-r--r-- | generic/ttk/ttkEntry.c | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/generic/tkConfig.c b/generic/tkConfig.c index 5d963d4..b3e76d2 100644 --- a/generic/tkConfig.c +++ b/generic/tkConfig.c @@ -205,7 +205,7 @@ Tk_CreateOptionTable( hashEntryPtr = Tcl_CreateHashEntry(hashTablePtr, (char *) templatePtr, &newEntry); if (!newEntry) { - tablePtr = (OptionTable *) Tcl_GetHashValue(hashEntryPtr); + tablePtr = Tcl_GetHashValue(hashEntryPtr); tablePtr->refCount++; return (Tk_OptionTable) tablePtr; } @@ -391,12 +391,11 @@ DestroyOptionHashTable( Tcl_HashTable *hashTablePtr = clientData; Tcl_HashSearch search; Tcl_HashEntry *hashEntryPtr; - OptionTable *tablePtr; for (hashEntryPtr = Tcl_FirstHashEntry(hashTablePtr, &search); hashEntryPtr != NULL; hashEntryPtr = Tcl_NextHashEntry(&search)) { - tablePtr = (OptionTable *) Tcl_GetHashValue(hashEntryPtr); + OptionTable *tablePtr = Tcl_GetHashValue(hashEntryPtr); /* * The following statements do two tricky things: diff --git a/generic/tkMain.c b/generic/tkMain.c index 9fd2f69..fddad3a 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -29,10 +29,15 @@ # endif #endif +#ifndef _WIN64 +/* See [Bug 2935503]: file mtime sets wrong time */ +# define _USE_32BIT_TIME_T +#endif + +#include "tkInt.h" #include <ctype.h> #include <stdio.h> #include <string.h> -#include "tkInt.h" #ifdef NO_STDLIB_H # include "../compat/stdlib.h" #else diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c index 5d0a435..136d4af 100644 --- a/generic/ttk/ttkEntry.c +++ b/generic/ttk/ttkEntry.c @@ -1225,10 +1225,10 @@ static void EntryDisplay(void *clientData, Drawable d) * clipping area from the GC, so we have to supply that by other means. */ - rect.x = entryPtr->entry.layoutX; - rect.y = entryPtr->entry.layoutY; + rect.x = textarea.x; + rect.y = textarea.y; rect.width = textarea.width; - rect.height = entryPtr->entry.layoutHeight; + rect.height = textarea.height; clipRegion = TkCreateRegion(); TkUnionRectWithRegion(&rect, clipRegion, clipRegion); #ifdef HAVE_XFT |