Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | More generic fix, for [8261c517af] and [2513186fff]. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | bug-2513186fff | bug-8261c517af |
Files: | files | file ages | folders |
SHA3-256: |
bc932da8d98fd1443b163fb1e1d5f973 |
User & Date: | fvogel 2019-04-27 15:49:23.355 |
Context
2019-04-27
| ||
15:55 | Revert irrelevant blank changes check-in: 6ac14e0c user: fvogel tags: bug-2513186fff, bug-8261c517af | |
15:49 | More generic fix, for [8261c517af] and [2513186fff]. check-in: bc932da8 user: fvogel tags: bug-2513186fff, bug-8261c517af | |
2019-04-26
| ||
22:02 | Write code more consistently with the rest of the ttkEntry.c file check-in: d5b120db user: fvogel tags: bug-2513186fff, bug-8261c517af | |
Changes
Changes to generic/ttk/ttkEntry.c.
︙ | ︙ | |||
1648 1649 1650 1651 1652 1653 1654 | /* $entry xview -- horizontal scrolling interface */ static int EntryXViewCommand( void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { Entry *entryPtr = recordPtr; | < < < < < < < < | 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 | /* $entry xview -- horizontal scrolling interface */ static int EntryXViewCommand( void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { Entry *entryPtr = recordPtr; if (objc == 3) { int newFirst; if (EntryIndex(interp, entryPtr, objv[2], &newFirst) != TCL_OK) { return TCL_ERROR; } TtkScrollTo(entryPtr->entry.xscrollHandle, newFirst); return TCL_OK; |
︙ | ︙ |
Changes to generic/ttk/ttkScroll.c.
︙ | ︙ | |||
193 194 195 196 197 198 199 | Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], ScrollHandle h) { Scrollable *s = h->scrollPtr; int newFirst = s->first; if (objc == 2) { Tcl_Obj *result[2]; | > > > > > > > > > | | 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 | Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], ScrollHandle h) { Scrollable *s = h->scrollPtr; int newFirst = s->first; if (objc == 2) { Tcl_Obj *result[2]; /* * Update the scroll info (first, last, total) if needed. */ if (h->corePtr->flags & REDISPLAY_PENDING) { h->corePtr->widgetSpec->layoutProc(h->corePtr); } result[0] = Tcl_NewDoubleObj((double)s->first / s->total); result[1] = Tcl_NewDoubleObj((double)s->last / s->total); Tcl_SetObjResult(interp, Tcl_NewListObj(2, result)); return TCL_OK; } else if (objc == 3) { if (Tcl_GetIntFromObj(interp, objv[2], &newFirst) != TCL_OK) { return TCL_ERROR; } |
︙ | ︙ | |||
230 231 232 233 234 235 236 237 238 239 240 241 242 243 | return TCL_OK; } void TtkScrollTo(ScrollHandle h, int newFirst) { Scrollable *s = h->scrollPtr; if (newFirst >= s->total) newFirst = s->total - 1; if (newFirst > s->first && s->last >= s->total) /* don't scroll past end */ newFirst = s->first; if (newFirst < 0) newFirst = 0; | > > > > > > > > | 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 | return TCL_OK; } void TtkScrollTo(ScrollHandle h, int newFirst) { Scrollable *s = h->scrollPtr; /* * Update the scroll info (first, last, total) if needed. */ if (h->corePtr->flags & REDISPLAY_PENDING) { h->corePtr->widgetSpec->layoutProc(h->corePtr); } if (newFirst >= s->total) newFirst = s->total - 1; if (newFirst > s->first && s->last >= s->total) /* don't scroll past end */ newFirst = s->first; if (newFirst < 0) newFirst = 0; |
︙ | ︙ |