Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Revert [ac229dabaa]. There is a reason the Tcl_GetIndexFromObj wrapper exists and is used. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
6c26562fe3f83eea390818ed36601930 |
User & Date: | jenglish 2013-02-27 14:41:41 |
Context
2013-02-28
| ||
09:10 | [Bug 3599312]: Apply fix for Alt key problems. check-in: 3972832e user: dkf tags: trunk | |
2013-02-27
| ||
14:41 | Revert [ac229dabaa]. There is a reason the Tcl_GetIndexFromObj wrapper exists and is used. check-in: 6c26562f user: jenglish tags: trunk | |
12:36 | Eliminate all Tcl_GetIndexFromObj calls, which is only a thin wrapper around Tcl_GetIndexFromObjStruct. check-in: ac229dab user: jan.nijtmans tags: trunk | |
Changes
Changes to generic/tkCanvas.c.
︙ | ︙ | |||
824 825 826 827 828 829 830 | CANV_SELECT, CANV_TYPE, CANV_XVIEW, CANV_YVIEW }; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?"); return TCL_ERROR; } | | | | 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 | CANV_SELECT, CANV_TYPE, CANV_XVIEW, CANV_YVIEW }; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?"); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0, &index) != TCL_OK) { return TCL_ERROR; } Tcl_Preserve(canvasPtr); result = TCL_OK; switch ((enum options) index) { case CANV_ADDTAG: |
︙ | ︙ | |||
1883 1884 1885 1886 1887 1888 1889 | static const char *const optionStrings[] = { "mark", "dragto", NULL }; if (objc < 5) { Tcl_WrongNumArgs(interp, 2, objv, "mark|dragto x y ?dragGain?"); result = TCL_ERROR; | | | | 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 | static const char *const optionStrings[] = { "mark", "dragto", NULL }; if (objc < 5) { Tcl_WrongNumArgs(interp, 2, objv, "mark|dragto x y ?dragGain?"); result = TCL_ERROR; } else if (Tcl_GetIndexFromObj(interp, objv[2], optionStrings, "scan option", 0, &index) != TCL_OK) { result = TCL_ERROR; } else if ((objc != 5) && (objc != 5+index)) { Tcl_WrongNumArgs(interp, 3, objv, index?"x y ?gain?":"x y"); result = TCL_ERROR; } else if ((Tcl_GetIntFromObj(interp, objv[3], &x) != TCL_OK) || (Tcl_GetIntFromObj(interp, objv[4], &y) != TCL_OK)){ result = TCL_ERROR; |
︙ | ︙ | |||
1955 1956 1957 1958 1959 1960 1961 | } if (objc == 5) { result = ItemIndex(canvasPtr, itemPtr, objv[4], &index); if (result != TCL_OK) { goto done; } } | | | | 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 | } if (objc == 5) { result = ItemIndex(canvasPtr, itemPtr, objv[4], &index); if (result != TCL_OK) { goto done; } } if (Tcl_GetIndexFromObj(interp, objv[2], optionStrings, "select option", 0, &optionindex) != TCL_OK) { result = TCL_ERROR; goto done; } switch ((enum options) optionindex) { case CANV_ADJUST: if (objc != 5) { Tcl_WrongNumArgs(interp, 3, objv, "tagOrId index"); |
︙ | ︙ | |||
4297 4298 4299 4300 4301 4302 4303 | }; if (newTag != NULL) { uid = Tk_GetUid(Tcl_GetString(newTag)); } else { uid = NULL; } | | | | 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 | }; if (newTag != NULL) { uid = Tk_GetUid(Tcl_GetString(newTag)); } else { uid = NULL; } if (Tcl_GetIndexFromObj(interp, objv[first], optionStrings, "search command", 0, &index) != TCL_OK) { return TCL_ERROR; } switch ((enum options) index) { case CANV_ABOVE: { Tk_Item *lastPtr = NULL; if (objc != first+2) { |
︙ | ︙ |
Changes to generic/tkClipboard.c.
︙ | ︙ | |||
430 431 432 433 434 435 436 | int index, i; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?"); return TCL_ERROR; } | | | | 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 | int index, i; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?"); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0, &index) != TCL_OK) { return TCL_ERROR; } switch ((enum options) index) { case CLIPBOARD_APPEND: { Atom target, format; const char *targetName = NULL; |
︙ | ︙ | |||
460 461 462 463 464 465 466 | /* * If the argument is "--", it signifies the end of arguments. */ if (string[1] == '-' && length == 2) { i++; break; } | | | | 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 | /* * If the argument is "--", it signifies the end of arguments. */ if (string[1] == '-' && length == 2) { i++; break; } if (Tcl_GetIndexFromObj(interp, objv[i], appendOptionStrings, "option", 0, &subIndex) != TCL_OK) { return TCL_ERROR; } /* * Increment i so that it points to the value for the flag instead * of the flag itself. */ |
︙ | ︙ | |||
523 524 525 526 527 528 529 | if (objc != 2 && objc != 4) { Tcl_WrongNumArgs(interp, 2, objv, "?-displayof window?"); return TCL_ERROR; } if (objc == 4) { | | | | 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 | if (objc != 2 && objc != 4) { Tcl_WrongNumArgs(interp, 2, objv, "?-displayof window?"); return TCL_ERROR; } if (objc == 4) { if (Tcl_GetIndexFromObj(interp, objv[2], clearOptionStrings, "option", 0, &subIndex) != TCL_OK) { return TCL_ERROR; } if ((enum clearOptions) subIndex == CLEAR_DISPLAYOF) { path = Tcl_GetString(objv[3]); } } if (path != NULL) { |
︙ | ︙ | |||
556 557 558 559 560 561 562 | int subIndex; for (i = 2; i < objc; i++) { string = Tcl_GetString(objv[i]); if (string[0] != '-') { break; } | | | | 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 | int subIndex; for (i = 2; i < objc; i++) { string = Tcl_GetString(objv[i]); if (string[0] != '-') { break; } if (Tcl_GetIndexFromObj(interp, objv[i], getOptionStrings, "option", 0, &subIndex) != TCL_OK) { return TCL_ERROR; } i++; if (i >= objc) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "value for \"%s\" missing", string)); Tcl_SetErrorCode(interp, "TK", "CLIPBOARD", "VALUE", NULL); |
︙ | ︙ |
Changes to generic/tkCmds.c.
︙ | ︙ | |||
756 757 758 759 760 761 762 | } else if (objc == 3) { int value; /* * Return the current value of the selected option */ | | | | | | 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 | } else if (objc == 3) { int value; /* * Return the current value of the selected option */ if (Tcl_GetIndexFromObj(interp, objv[2], caretStrings, "caret option", 0, &index) != TCL_OK) { return TCL_ERROR; } if (index == TK_CARET_X) { value = caretPtr->x; } else if (index == TK_CARET_Y) { value = caretPtr->y; } else /* if (index == TK_CARET_HEIGHT) -- last case */ { value = caretPtr->height; } Tcl_SetObjResult(interp, Tcl_NewIntObj(value)); } else { int i, value, x = 0, y = 0, height = -1; for (i = 2; i < objc; i += 2) { if ((Tcl_GetIndexFromObj(interp, objv[i], caretStrings, "caret option", 0, &index) != TCL_OK) || Tcl_GetIntFromObj(interp,objv[i+1],&value) != TCL_OK) { return TCL_ERROR; } if (index == TK_CARET_X) { x = value; } else if (index == TK_CARET_Y) { y = value; |
︙ | ︙ | |||
1007 1008 1009 1010 1011 1012 1013 | }; if (objc != 3) { Tcl_WrongNumArgs(interp, 1, objv, "variable|visibility|window name"); return TCL_ERROR; } | | | | 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 | }; if (objc != 3) { Tcl_WrongNumArgs(interp, 1, objv, "variable|visibility|window name"); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0, &index) != TCL_OK) { return TCL_ERROR; } switch ((enum options) index) { case TKWAIT_VARIABLE: if (Tcl_TraceVar2(interp, Tcl_GetString(objv[2]), NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS, |
︙ | ︙ | |||
1188 1189 1190 1191 1192 1193 1194 | int flags, index; TkDisplay *dispPtr; int code = TCL_OK; if (objc == 1) { flags = TCL_DONT_WAIT; } else if (objc == 2) { | | | | 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 | int flags, index; TkDisplay *dispPtr; int code = TCL_OK; if (objc == 1) { flags = TCL_DONT_WAIT; } else if (objc == 2) { if (Tcl_GetIndexFromObj(interp, objv[1], updateOptions, "option", 0, &index) != TCL_OK) { return TCL_ERROR; } flags = TCL_IDLE_EVENTS; } else { Tcl_WrongNumArgs(interp, 1, objv, "?idletasks?"); return TCL_ERROR; } |
︙ | ︙ | |||
1335 1336 1337 1338 1339 1340 1341 | WIN_VISUALSAVAILABLE }; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "option ?arg?"); return TCL_ERROR; } | | | | 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 | WIN_VISUALSAVAILABLE }; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "option ?arg?"); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0, &index) != TCL_OK) { return TCL_ERROR; } if (index < WIN_ATOM) { if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "window"); return TCL_ERROR; |
︙ | ︙ | |||
1859 1860 1861 1862 1863 1864 1865 | tkwin = (Tk_Window) clientData; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "option window ?arg?"); return TCL_ERROR; } | | | | 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 | tkwin = (Tk_Window) clientData; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "option window ?arg?"); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0, &index) != TCL_OK) { return TCL_ERROR; } if (index == TKWM_TRACING) { int wmTracing; TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr; |
︙ | ︙ |
Changes to generic/tkEntry.c.
︙ | ︙ | |||
598 599 600 601 602 603 604 | } /* * Parse the widget command by looking up the second token in the list of * valid command names. */ | | | | 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 | } /* * Parse the widget command by looking up the second token in the list of * valid command names. */ result = Tcl_GetIndexFromObj(interp, objv[1], entryCmdNames, "option", 0, &cmdIndex); if (result != TCL_OK) { return result; } Tcl_Preserve(entryPtr); switch ((enum entryCmd) cmdIndex) { case COMMAND_BBOX: { |
︙ | ︙ | |||
778 779 780 781 782 783 784 | } /* * Parse the selection sub-command, using the command table * "selCmdNames" defined above. */ | | | | 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 | } /* * Parse the selection sub-command, using the command table * "selCmdNames" defined above. */ result = Tcl_GetIndexFromObj(interp, objv[2], selCmdNames, "selection option", 0, &selIndex); if (result != TCL_OK) { goto error; } /* * Disabled entries don't allow the selection to be modified, but * 'selection present' must return a boolean. |
︙ | ︙ | |||
3652 3653 3654 3655 3656 3657 3658 | } /* * Parse the widget command by looking up the second token in the list of * valid command names. */ | | | | 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 | } /* * Parse the widget command by looking up the second token in the list of * valid command names. */ result = Tcl_GetIndexFromObj(interp, objv[1], sbCmdNames, "option", 0, &cmdIndex); if (result != TCL_OK) { return result; } Tcl_Preserve(entryPtr); switch ((enum sbCmd) cmdIndex) { case SB_CMD_BBOX: { |
︙ | ︙ | |||
3813 3814 3815 3816 3817 3818 3819 | } case SB_CMD_INVOKE: if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "elemName"); goto error; } | | | | 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 | } case SB_CMD_INVOKE: if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "elemName"); goto error; } result = Tcl_GetIndexFromObj(interp, objv[2], selElementNames, "element", 0, &cmdIndex); if (result != TCL_OK) { goto error; } if (entryPtr->state != STATE_DISABLED) { if (SpinboxInvoke(interp, sbPtr, cmdIndex) != TCL_OK) { goto error; } |
︙ | ︙ | |||
3869 3870 3871 3872 3873 3874 3875 | } /* * Parse the selection sub-command, using the command table * "sbSelCmdNames" defined above. */ | | | | 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 | } /* * Parse the selection sub-command, using the command table * "sbSelCmdNames" defined above. */ result = Tcl_GetIndexFromObj(interp, objv[2], sbSelCmdNames, "selection option", 0, &selIndex); if (result != TCL_OK) { goto error; } /* * Disabled entries don't allow the selection to be modified, but * 'selection present' must return a boolean. |
︙ | ︙ | |||
3999 4000 4001 4002 4003 4004 4005 | } if (objc == 3) { Tcl_SetObjResult(interp, Tcl_NewStringObj( selElementNames[sbPtr->selElement], -1)); } else { int lastElement = sbPtr->selElement; | | | | 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 | } if (objc == 3) { Tcl_SetObjResult(interp, Tcl_NewStringObj( selElementNames[sbPtr->selElement], -1)); } else { int lastElement = sbPtr->selElement; result = Tcl_GetIndexFromObj(interp, objv[3], selElementNames, "selection element", 0, &(sbPtr->selElement)); if (result != TCL_OK) { goto error; } if (lastElement != sbPtr->selElement) { EventuallyRedraw(entryPtr); } } |
︙ | ︙ |
Changes to generic/tkEvent.c.
︙ | ︙ | |||
352 353 354 355 356 357 358 | } if (winPtr->inputContext == NULL) { /* XCreateIC failed. */ return; } | | | 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 | } if (winPtr->inputContext == NULL) { /* XCreateIC failed. */ return; } /* * Adjust the window's event mask if the IM requires it. */ XGetICValues(winPtr->inputContext, XNFilterEvents, &im_event_mask, NULL); if ((winPtr->atts.event_mask & im_event_mask) != im_event_mask) { winPtr->atts.event_mask |= im_event_mask; XSelectInput(winPtr->display, winPtr->window, winPtr->atts.event_mask); |
︙ | ︙ |
Changes to generic/tkFont.c.
︙ | ︙ | |||
482 483 484 485 486 487 488 | FONT_FAMILIES, FONT_MEASURE, FONT_METRICS, FONT_NAMES }; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "option ?arg?"); return TCL_ERROR; } | | | | 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 | FONT_FAMILIES, FONT_MEASURE, FONT_METRICS, FONT_NAMES }; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "option ?arg?"); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0, &index) != TCL_OK) { return TCL_ERROR; } switch ((enum options) index) { case FONT_ACTUAL: { int skip, result, n; const char *s; |
︙ | ︙ | |||
759 760 761 762 763 764 765 | fmPtr = GetFontMetrics(tkfont); if (objc == 3) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "-ascent %d -descent %d -linespace %d -fixed %d", fmPtr->ascent, fmPtr->descent, fmPtr->ascent + fmPtr->descent, fmPtr->fixed)); } else { | | | | 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 | fmPtr = GetFontMetrics(tkfont); if (objc == 3) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "-ascent %d -descent %d -linespace %d -fixed %d", fmPtr->ascent, fmPtr->descent, fmPtr->ascent + fmPtr->descent, fmPtr->fixed)); } else { if (Tcl_GetIndexFromObj(interp, objv[3], switches, "metric", 0, &index) != TCL_OK) { Tk_FreeFont(tkfont); return TCL_ERROR; } i = 0; /* Needed only to prevent compiler warning. */ switch (index) { case 0: i = fmPtr->ascent; break; case 1: i = fmPtr->descent; break; |
︙ | ︙ | |||
3364 3365 3366 3367 3368 3369 3370 | Tcl_Obj *optionPtr, *valuePtr; const char *value; for (i = 0; i < objc; i += 2) { optionPtr = objv[i]; valuePtr = objv[i + 1]; | | | | 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 | Tcl_Obj *optionPtr, *valuePtr; const char *value; for (i = 0; i < objc; i += 2) { optionPtr = objv[i]; valuePtr = objv[i + 1]; if (Tcl_GetIndexFromObj(interp, optionPtr, fontOpt, "option", 1, &index) != TCL_OK) { return TCL_ERROR; } if ((i+2 >= objc) && (objc & 1)) { /* * This test occurs after Tcl_GetIndexFromObj() so that "font * create xyz -xyz" will return the error message that "-xyz" is a * bad option, rather than that the value for "-xyz" is missing. |
︙ | ︙ | |||
3464 3465 3466 3467 3468 3469 3470 | int i, index, start, end; const char *str; Tcl_Obj *valuePtr, *resultPtr = NULL; start = 0; end = FONT_NUMFIELDS; if (objPtr != NULL) { | | | | 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 | int i, index, start, end; const char *str; Tcl_Obj *valuePtr, *resultPtr = NULL; start = 0; end = FONT_NUMFIELDS; if (objPtr != NULL) { if (Tcl_GetIndexFromObj(interp, objPtr, fontOpt, "option", TCL_EXACT, &index) != TCL_OK) { return TCL_ERROR; } start = index; end = index + 1; } valuePtr = NULL; |
︙ | ︙ |
Changes to generic/tkGet.c.
︙ | ︙ | |||
67 68 69 70 71 72 73 | * from. */ Tk_Anchor *anchorPtr) /* Where to place the Tk_Anchor that * corresponds to the string value of * objPtr. */ { int index, code; | | | | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | * from. */ Tk_Anchor *anchorPtr) /* Where to place the Tk_Anchor that * corresponds to the string value of * objPtr. */ { int index, code; code = Tcl_GetIndexFromObj(interp, objPtr, anchorStrings, "anchor", 0, &index); if (code == TCL_OK) { *anchorPtr = (Tk_Anchor) index; } return code; } /* |
︙ | ︙ | |||
381 382 383 384 385 386 387 | * from. */ Tk_Justify *justifyPtr) /* Where to place the Tk_Justify that * corresponds to the string value of * objPtr. */ { int index, code; | | | | 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 | * from. */ Tk_Justify *justifyPtr) /* Where to place the Tk_Justify that * corresponds to the string value of * objPtr. */ { int index, code; code = Tcl_GetIndexFromObj(interp, objPtr, justifyStrings, "justification", 0, &index); if (code == TCL_OK) { *justifyPtr = (Tk_Justify) index; } return code; } /* |
︙ | ︙ |
Changes to generic/tkGrab.c.
︙ | ︙ | |||
236 237 238 239 240 241 242 | } tkwin = Tk_NameToWindow(interp, arg, clientData); if (tkwin == NULL) { return TCL_ERROR; } return Tk_Grab(interp, tkwin, 0); } else if (arg[0] == '-' && len > 1) { | | | | | | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 | } tkwin = Tk_NameToWindow(interp, arg, clientData); if (tkwin == NULL) { return TCL_ERROR; } return Tk_Grab(interp, tkwin, 0); } else if (arg[0] == '-' && len > 1) { if (Tcl_GetIndexFromObj(interp, objv[1], flagStrings, "option", 0, &index) != TCL_OK) { return TCL_ERROR; } /* [grab -global window] */ if (objc != 3) { Tcl_WrongNumArgs(interp, 1, objv, "?-global? window"); return TCL_ERROR; } tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]), clientData); if (tkwin == NULL) { return TCL_ERROR; } return Tk_Grab(interp, tkwin, 1); } /* * First argument is not a window name and not "-global", find out which * option it is. */ if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0, &index) != TCL_OK) { return TCL_ERROR; } switch ((enum options) index) { case GRABCMD_CURRENT: /* [grab current ?window?] */ if (objc > 3) { |
︙ | ︙ | |||
329 330 331 332 333 334 335 | /* * We could just test the argument by hand instead of using * Tcl_GetIndexFromObj; the benefit of using the function is that * it sets up the error message for us, so we are certain to be * consistant with the rest of Tcl. */ | | | | 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 | /* * We could just test the argument by hand instead of using * Tcl_GetIndexFromObj; the benefit of using the function is that * it sets up the error message for us, so we are certain to be * consistant with the rest of Tcl. */ if (Tcl_GetIndexFromObj(interp, objv[2], flagStrings, "option", 0, &index) != TCL_OK) { return TCL_ERROR; } tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[3]), clientData); } if (tkwin == NULL) { return TCL_ERROR; |
︙ | ︙ |
Changes to generic/tkImgPhoto.c.
︙ | ︙ | |||
416 417 418 419 420 421 422 | Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?"); return TCL_ERROR; } | | | | 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 | Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?"); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[1], photoOptions, "option", 0, &index) != TCL_OK) { return TCL_ERROR; } switch ((enum PhotoOptions) index) { case PHOTO_BLANK: /* * photo blank command - just call Tk_PhotoBlank. |
︙ | ︙ | |||
1141 1142 1143 1144 1145 1146 1147 | PHOTO_TRANS_GET, PHOTO_TRANS_SET }; if (objc < 3) { Tcl_WrongNumArgs(interp, 2, objv, "option ?arg ...?"); return TCL_ERROR; } | | | | 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 | PHOTO_TRANS_GET, PHOTO_TRANS_SET }; if (objc < 3) { Tcl_WrongNumArgs(interp, 2, objv, "option ?arg ...?"); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[2], photoTransOptions, "option", 0, &index) != TCL_OK) { return TCL_ERROR; } switch ((enum transOptions) index) { case PHOTO_TRANS_GET: { XRectangle testBox; TkRegion testRegion; |
︙ | ︙ | |||
1561 1562 1563 1564 1565 1566 1567 | * well-known set. */ if (index + 1 >= objc) { goto oneValueRequired; } index++; | | | | 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 | * well-known set. */ if (index + 1 >= objc) { goto oneValueRequired; } index++; if (Tcl_GetIndexFromObj(interp, objv[index], compositingRules, "compositing rule", 0, &optPtr->compositingRule) != TCL_OK) { return TCL_ERROR; } *optIndexPtr = index; } else if ((bit != OPT_SHRINK) && (bit != OPT_GRAYSCALE)) { const char *val; |
︙ | ︙ |
Changes to generic/tkListbox.c.
︙ | ︙ | |||
611 612 613 614 615 616 617 | } /* * Parse the command by looking up the second argument in the list of * valid subcommand names */ | | | | 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 | } /* * Parse the command by looking up the second argument in the list of * valid subcommand names */ result = Tcl_GetIndexFromObj(interp, objv[1], commandNames, "option", 0, &cmdIndex); if (result != TCL_OK) { return result; } Tcl_Preserve(listPtr); /* |
︙ | ︙ | |||
965 966 967 968 969 970 971 | if (Tcl_GetIntFromObj(interp, objv[3], &x) != TCL_OK || Tcl_GetIntFromObj(interp, objv[4], &y) != TCL_OK) { result = TCL_ERROR; break; } | | | | 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 | if (Tcl_GetIntFromObj(interp, objv[3], &x) != TCL_OK || Tcl_GetIntFromObj(interp, objv[4], &y) != TCL_OK) { result = TCL_ERROR; break; } result = Tcl_GetIndexFromObj(interp, objv[2], scanCommandNames, "option", 0, &scanCmdIndex); if (result != TCL_OK) { break; } switch (scanCmdIndex) { case SCAN_MARK: listPtr->scanMarkX = x; listPtr->scanMarkY = y; |
︙ | ︙ | |||
1160 1161 1162 1163 1164 1165 1166 | last = first; if (objc == 5) { result = GetListboxIndex(interp, listPtr, objv[4], 0, &last); if (result != TCL_OK) { return result; } } | | | | 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 | last = first; if (objc == 5) { result = GetListboxIndex(interp, listPtr, objv[4], 0, &last); if (result != TCL_OK) { return result; } } result = Tcl_GetIndexFromObj(interp, objv[2], selCommandNames, "option", 0, &selCmdIndex); if (result != TCL_OK) { return result; } /* * Only allow 'selection includes' to respond if disabled. [Bug #632514] */ |
︙ | ︙ | |||
2705 2706 2707 2708 2709 2710 2711 | int result, index; const char *stringRep; /* * First see if the index is one of the named indices. */ | | < | 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 | int result, index; const char *stringRep; /* * First see if the index is one of the named indices. */ result = Tcl_GetIndexFromObj(NULL, indexObj, indexNames, "", 0, &index); if (result == TCL_OK) { switch (index) { case INDEX_ACTIVE: /* "active" index */ *indexPtr = listPtr->active; break; case INDEX_ANCHOR: |
︙ | ︙ |
Changes to generic/tkPanedWindow.c.
︙ | ︙ | |||
536 537 538 539 540 541 542 | Slave *slavePtr; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "option ?arg arg...?"); return TCL_ERROR; } | | | | 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 | Slave *slavePtr; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "option ?arg arg...?"); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "command", 0, &index) != TCL_OK) { return TCL_ERROR; } Tcl_Preserve(pwPtr); switch ((enum options) index) { case PW_ADD: |
︙ | ︙ | |||
1080 1081 1082 1083 1084 1085 1086 | Slave *slavePtr; if (objc < 3) { Tcl_WrongNumArgs(interp, 2, objv, "option ?arg ...?"); return TCL_ERROR; } | | | | 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 | Slave *slavePtr; if (objc < 3) { Tcl_WrongNumArgs(interp, 2, objv, "option ?arg ...?"); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[2], sashOptionStrings, "option", 0, &index) != TCL_OK) { return TCL_ERROR; } switch ((enum sashOptions) index) { case SASH_COORD: if (objc != 4) { Tcl_WrongNumArgs(interp, 3, objv, "index"); |
︙ | ︙ | |||
2774 2775 2776 2777 2778 2779 2780 | Tcl_Obj *coords[2]; if (objc < 3) { Tcl_WrongNumArgs(interp, 2, objv, "option ?arg ...?"); return TCL_ERROR; } | | | | 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 | Tcl_Obj *coords[2]; if (objc < 3) { Tcl_WrongNumArgs(interp, 2, objv, "option ?arg ...?"); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[2], optionStrings, "option", 0, &index) != TCL_OK) { return TCL_ERROR; } switch ((enum options) index) { case PROXY_COORD: if (objc != 3) { Tcl_WrongNumArgs(interp, 3, objv, NULL); |
︙ | ︙ |
Changes to generic/tkSelect.c.
︙ | ︙ | |||
685 686 687 688 689 690 691 | }; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?"); return TCL_ERROR; } | | | | 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 | }; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?"); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0, &index) != TCL_OK) { return TCL_ERROR; } switch ((enum options) index) { case SELECTION_CLEAR: { static const char *const clearOptionStrings[] = { "-displayof", "-selection", NULL |
︙ | ︙ | |||
711 712 713 714 715 716 717 | if (count < 2) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "value for \"%s\" missing", string)); Tcl_SetErrorCode(interp, "TK", "SELECTION", "VALUE", NULL); return TCL_ERROR; } | | | | 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 | if (count < 2) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "value for \"%s\" missing", string)); Tcl_SetErrorCode(interp, "TK", "SELECTION", "VALUE", NULL); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objs[0], clearOptionStrings, "option", 0, &clearIndex) != TCL_OK) { return TCL_ERROR; } switch ((enum clearOptions) clearIndex) { case CLEAR_DISPLAYOF: path = Tcl_GetString(objs[1]); break; case CLEAR_SELECTION: |
︙ | ︙ | |||
771 772 773 774 775 776 777 | if (count < 2) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "value for \"%s\" missing", string)); Tcl_SetErrorCode(interp, "TK", "SELECTION", "VALUE", NULL); return TCL_ERROR; } | | | | 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 | if (count < 2) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "value for \"%s\" missing", string)); Tcl_SetErrorCode(interp, "TK", "SELECTION", "VALUE", NULL); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objs[0], getOptionStrings, "option", 0, &getIndex) != TCL_OK) { return TCL_ERROR; } switch ((enum getOptions) getIndex) { case GET_DISPLAYOF: path = Tcl_GetString(objs[1]); break; |
︙ | ︙ | |||
849 850 851 852 853 854 855 | if (count < 2) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "value for \"%s\" missing", string)); Tcl_SetErrorCode(interp, "TK", "SELECTION", "VALUE", NULL); return TCL_ERROR; } | | | | 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 | if (count < 2) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "value for \"%s\" missing", string)); Tcl_SetErrorCode(interp, "TK", "SELECTION", "VALUE", NULL); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objs[0],handleOptionStrings, "option", 0, &handleIndex) != TCL_OK) { return TCL_ERROR; } switch ((enum handleOptions) handleIndex) { case HANDLE_FORMAT: formatName = Tcl_GetString(objs[1]); break; |
︙ | ︙ | |||
936 937 938 939 940 941 942 | if (count < 2) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "value for \"%s\" missing", string)); Tcl_SetErrorCode(interp, "TK", "SELECTION", "VALUE", NULL); return TCL_ERROR; } | | | | 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 | if (count < 2) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "value for \"%s\" missing", string)); Tcl_SetErrorCode(interp, "TK", "SELECTION", "VALUE", NULL); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objs[0], ownOptionStrings, "option", 0, &ownIndex) != TCL_OK) { return TCL_ERROR; } switch ((enum ownOptions) ownIndex) { case OWN_COMMAND: commandObj = objs[1]; break; |
︙ | ︙ |
Changes to generic/tkTextBTree.c.
︙ | ︙ | |||
1985 1986 1987 1988 1989 1990 1991 | if (nodePtr2 == NULL) { Tcl_Panic("TkBTreeLinesTo couldn't find node"); } index += nodePtr2->numLines; } } if (textPtr != NULL) { | | | 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 | if (nodePtr2 == NULL) { Tcl_Panic("TkBTreeLinesTo couldn't find node"); } index += nodePtr2->numLines; } } if (textPtr != NULL) { /* * The index to return must be relative to textPtr, not to the entire * tree. Take care to never return a negative index when linePtr * denotes a line before -startline, or an index larger than the * number of lines in textPtr when linePtr is a line past -endline. */ int indexStart, indexEnd; |
︙ | ︙ |