diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-02-01 14:30:07 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-02-01 14:30:07 (GMT) |
| commit | 36cc0029458ead72be711c8c402f55a4fd26edd3 (patch) | |
| tree | 9d78414244a27069e5362313cf542baba8dfefb1 /generic/tkEntry.c | |
| parent | c122ab6dc1e84c1b07be22f6b1b3983df7268a68 (diff) | |
| parent | 5f84e8bb5604b44e2682c85e6bf8724deb5c3257 (diff) | |
| download | tk-36cc0029458ead72be711c8c402f55a4fd26edd3.zip tk-36cc0029458ead72be711c8c402f55a4fd26edd3.tar.gz tk-36cc0029458ead72be711c8c402f55a4fd26edd3.tar.bz2 | |
Use internalRep.twoPtrValue.ptr1 in stead of internalRep.otherValuePtr everywhere.
Change some internal "length" variables from type int to type size_t, so it could handle bigger string sizes (for "novem")
Diffstat (limited to 'generic/tkEntry.c')
| -rw-r--r-- | generic/tkEntry.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/tkEntry.c b/generic/tkEntry.c index 9d1595c..551da30 100644 --- a/generic/tkEntry.c +++ b/generic/tkEntry.c @@ -1019,7 +1019,7 @@ DestroyEntry( * Tk_FreeOptions handle all the standard option-related stuff. */ - ckfree(entryPtr->string); + ckfree((char *)entryPtr->string); if (entryPtr->textVarName != NULL) { Tcl_UntraceVar(entryPtr->interp, entryPtr->textVarName, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS, @@ -1034,7 +1034,7 @@ DestroyEntry( } Tcl_DeleteTimerHandler(entryPtr->insertBlinkHandler); if (entryPtr->displayString != entryPtr->string) { - ckfree(entryPtr->displayString); + ckfree((char *)entryPtr->displayString); } if (entryPtr->type == TK_SPINBOX) { Spinbox *sbPtr = (Spinbox *) entryPtr; @@ -1881,7 +1881,7 @@ EntryComputeGeometry( char *p; if (entryPtr->displayString != entryPtr->string) { - ckfree(entryPtr->displayString); + ckfree((char *)entryPtr->displayString); entryPtr->displayString = entryPtr->string; entryPtr->numDisplayBytes = entryPtr->numBytes; } @@ -2037,7 +2037,7 @@ InsertChars( return; } - ckfree(string); + ckfree((char *)string); entryPtr->string = newStr; /* @@ -2142,7 +2142,7 @@ DeleteChars( } ckfree(toDelete); - ckfree(entryPtr->string); + ckfree((char *)entryPtr->string); entryPtr->string = newStr; entryPtr->numChars -= count; entryPtr->numBytes -= byteCount; @@ -2318,13 +2318,13 @@ EntrySetValue( if (entryPtr->flags & VALIDATE_ABORT) { entryPtr->flags &= ~VALIDATE_ABORT; - ckfree(value); + ckfree((char *)value); return; } } oldSource = entryPtr->string; - ckfree(entryPtr->string); + ckfree((char *)entryPtr->string); if (malloced) { entryPtr->string = value; |