Skip to content

Commit 2c241dd

Browse files
author
jan.nijtmans
committed
Merge trunk
2 parents 499ffad + 1efef6c commit 2c241dd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+213
-204
lines changed

‎.github/workflows/linux-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
uses: actions/checkout@v6
3939
with:
4040
repository: tcltk/tcl
41-
ref: main
41+
ref: tip-626
4242
path: tcl
4343
- name: Setup Environment (compiler=${{ matrix.compiler }})
4444
run: |
@@ -142,7 +142,7 @@ jobs:
142142
uses: actions/checkout@v5
143143
with:
144144
repository: tcltk/tcl
145-
ref: main
145+
ref: tip-626
146146
path: tcl
147147
- name: Setup Environment (compiler=${{ matrix.compiler }})
148148
run: |

‎.github/workflows/mac-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/checkout@v6
2727
with:
2828
repository: tcltk/tcl
29-
ref: main
29+
ref: tip-626
3030
path: tcl
3131
- name: Prepare checked out repositories
3232
run: |
@@ -78,7 +78,7 @@ jobs:
7878
uses: actions/checkout@v6
7979
with:
8080
repository: tcltk/tcl
81-
ref: main
81+
ref: tip-626
8282
path: tcl
8383
- name: Prepare checked out repositories
8484
env:

‎.github/workflows/onefiledist.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/checkout@v6
2828
with:
2929
repository: tcltk/tcl
30-
ref: main
30+
ref: tip-626
3131
path: tcl
3232
- name: Prepare
3333
run: |
@@ -91,7 +91,7 @@ jobs:
9191
uses: actions/checkout@v6
9292
with:
9393
repository: tcltk/tcl
94-
ref: main
94+
ref: tip-626
9595
path: tcl
9696
- name: Checkout create-dmg
9797
uses: actions/checkout@v6
@@ -182,7 +182,7 @@ jobs:
182182
uses: actions/checkout@v6
183183
with:
184184
repository: tcltk/tcl
185-
ref: main
185+
ref: tip-626
186186
path: tcl
187187
- name: Prepare
188188
run: |

‎.github/workflows/win-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
uses: actions/checkout@v6
3434
with:
3535
repository: tcltk/tcl
36-
ref: main
36+
ref: tip-626
3737
path: tcl
3838
- name: Init MSVC
3939
uses: ilammy/msvc-dev-cmd@v1
@@ -123,7 +123,7 @@ jobs:
123123
uses: actions/checkout@v6
124124
with:
125125
repository: tcltk/tcl
126-
ref: main
126+
ref: tip-626
127127
path: tcl
128128
- name: Prepare
129129
run: |

‎generic/tkBind.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3328,10 +3328,11 @@ int
33283328
Tk_EventObjCmd(
33293329
void *clientData, /* Main window associated with interpreter. */
33303330
Tcl_Interp *interp, /* Current interpreter. */
3331-
int objc, /* Number of arguments. */
3331+
Tcl_Size objc, /* Number of arguments. */
33323332
Tcl_Obj *const objv[]) /* Argument objects. */
33333333
{
3334-
int index, i;
3334+
int index;
3335+
Tcl_Size i;
33353336
char *name;
33363337
const char *event;
33373338
Tk_Window tkwin;

‎generic/tkButton.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ int
561561
Tk_ButtonObjCmd(
562562
void *clientData, /* Either NULL or pointer to option table. */
563563
Tcl_Interp *interp, /* Current interpreter. */
564-
int objc, /* Number of arguments. */
564+
Tcl_Size objc, /* Number of arguments. */
565565
Tcl_Obj *const objv[]) /* Argument values. */
566566
{
567567
return ButtonCreate(clientData, interp, objc, objv, TYPE_BUTTON);
@@ -571,7 +571,7 @@ int
571571
Tk_CheckbuttonObjCmd(
572572
void *clientData, /* Either NULL or pointer to option table. */
573573
Tcl_Interp *interp, /* Current interpreter. */
574-
int objc, /* Number of arguments. */
574+
Tcl_Size objc, /* Number of arguments. */
575575
Tcl_Obj *const objv[]) /* Argument values. */
576576
{
577577
return ButtonCreate(clientData, interp, objc, objv, TYPE_CHECK_BUTTON);
@@ -581,7 +581,7 @@ int
581581
Tk_LabelObjCmd(
582582
void *clientData, /* Either NULL or pointer to option table. */
583583
Tcl_Interp *interp, /* Current interpreter. */
584-
int objc, /* Number of arguments. */
584+
Tcl_Size objc, /* Number of arguments. */
585585
Tcl_Obj *const objv[]) /* Argument values. */
586586
{
587587
return ButtonCreate(clientData, interp, objc, objv, TYPE_LABEL);
@@ -591,7 +591,7 @@ int
591591
Tk_RadiobuttonObjCmd(
592592
void *clientData, /* Either NULL or pointer to option table. */
593593
Tcl_Interp *interp, /* Current interpreter. */
594-
int objc, /* Number of arguments. */
594+
Tcl_Size objc, /* Number of arguments. */
595595
Tcl_Obj *const objv[]) /* Argument values. */
596596
{
597597
return ButtonCreate(clientData, interp, objc, objv, TYPE_RADIO_BUTTON);

‎generic/tkCanvLine.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ ComputeLineBbox(
724724
coordPtr = linePtr->firstArrowPtr;
725725
}
726726
}
727-
if (tsoffset->flags > (linePtr->numPoints * 2)) {
727+
if (tsoffset->flags > (int)(linePtr->numPoints * 2)) {
728728
coordPtr = linePtr->coordPtr + (linePtr->numPoints * 2);
729729
if ((linePtr->arrow == ARROWS_LAST)
730730
|| (linePtr->arrow == ARROWS_BOTH)) {

‎generic/tkCanvas.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ int
642642
Tk_CanvasObjCmd(
643643
void *clientData, /* Main window associated with interpreter. */
644644
Tcl_Interp *interp, /* Current interpreter. */
645-
int objc, /* Number of arguments. */
645+
Tcl_Size objc, /* Number of arguments. */
646646
Tcl_Obj *const objv[]) /* Argument objects. */
647647
{
648648
Tk_Window tkwin = (Tk_Window)clientData;
@@ -1970,7 +1970,7 @@ CanvasWidgetCmd(
19701970
goto done;
19711971
}
19721972
if (canvasPtr->textInfo.selItemPtr == itemPtr) {
1973-
if (index + 1 <= ((canvasPtr->textInfo.selectFirst
1973+
if ((Tcl_Size)index + 1 <= ((canvasPtr->textInfo.selectFirst
19741974
+ canvasPtr->textInfo.selectLast)/2)) {
19751975
canvasPtr->textInfo.selectAnchor =
19761976
canvasPtr->textInfo.selectLast + 1;

‎generic/tkClipboard.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,15 +420,16 @@ int
420420
Tk_ClipboardObjCmd(
421421
void *clientData, /* Main window associated with interpreter. */
422422
Tcl_Interp *interp, /* Current interpreter. */
423-
int objc, /* Number of arguments. */
423+
Tcl_Size objc, /* Number of arguments. */
424424
Tcl_Obj *const objv[]) /* Argument strings. */
425425
{
426426
Tk_Window tkwin = (Tk_Window)clientData;
427427
const char *path = NULL;
428428
Atom selection;
429429
static const char *const optionStrings[] = {
430430
"append", "clear", "get", NULL };
431-
int index, i, result;
431+
int index;
432+
Tcl_Size i, result;
432433

433434
if (objc < 2) {
434435
Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");

‎generic/tkCmds.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ int
9898
Tk_BellObjCmd(
9999
void *clientData, /* Main window associated with interpreter. */
100100
Tcl_Interp *interp, /* Current interpreter. */
101-
int objc, /* Number of arguments. */
101+
Tcl_Size objc, /* Number of arguments. */
102102
Tcl_Obj *const objv[]) /* Argument objects. */
103103
{
104104
static const char *const bellOptions[] = {
@@ -167,7 +167,7 @@ int
167167
Tk_BindObjCmd(
168168
void *clientData, /* Main window associated with interpreter. */
169169
Tcl_Interp *interp, /* Current interpreter. */
170-
int objc, /* Number of arguments. */
170+
Tcl_Size objc, /* Number of arguments. */
171171
Tcl_Obj *const objv[]) /* Argument objects. */
172172
{
173173
Tk_Window tkwin = (Tk_Window)clientData;
@@ -351,7 +351,7 @@ int
351351
Tk_BindtagsObjCmd(
352352
void *clientData, /* Main window associated with interpreter. */
353353
Tcl_Interp *interp, /* Current interpreter. */
354-
int objc, /* Number of arguments. */
354+
Tcl_Size objc, /* Number of arguments. */
355355
Tcl_Obj *const objv[]) /* Argument objects. */
356356
{
357357
Tk_Window tkwin = (Tk_Window)clientData;
@@ -491,7 +491,7 @@ int
491491
Tk_DestroyObjCmd(
492492
void *clientData, /* Main window associated with interpreter. */
493493
Tcl_Interp *interp, /* Current interpreter. */
494-
int objc, /* Number of arguments. */
494+
Tcl_Size objc, /* Number of arguments. */
495495
Tcl_Obj *const objv[]) /* Argument objects. */
496496
{
497497
Tk_Window window;
@@ -538,7 +538,7 @@ int
538538
Tk_LowerObjCmd(
539539
void *clientData, /* Main window associated with interpreter. */
540540
Tcl_Interp *interp, /* Current interpreter. */
541-
int objc, /* Number of arguments. */
541+
Tcl_Size objc, /* Number of arguments. */
542542
Tcl_Obj *const objv[]) /* Argument objects. */
543543
{
544544
Tk_Window mainwin = (Tk_Window)clientData;
@@ -597,7 +597,7 @@ int
597597
Tk_RaiseObjCmd(
598598
void *clientData, /* Main window associated with interpreter. */
599599
Tcl_Interp *interp, /* Current interpreter. */
600-
int objc, /* Number of arguments. */
600+
Tcl_Size objc, /* Number of arguments. */
601601
Tcl_Obj *const objv[]) /* Argument objects. */
602602
{
603603
Tk_Window mainwin = (Tk_Window)clientData;
@@ -1435,7 +1435,7 @@ int
14351435
Tk_TkwaitObjCmd(
14361436
void *clientData, /* Main window associated with interpreter. */
14371437
Tcl_Interp *interp, /* Current interpreter. */
1438-
int objc, /* Number of arguments. */
1438+
Tcl_Size objc, /* Number of arguments. */
14391439
Tcl_Obj *const objv[]) /* Argument objects. */
14401440
{
14411441
Tk_Window tkwin = (Tk_Window)clientData;
@@ -1622,7 +1622,7 @@ int
16221622
Tk_UpdateObjCmd(
16231623
TCL_UNUSED(void *), /* Main window associated with interpreter. */
16241624
Tcl_Interp *interp, /* Current interpreter. */
1625-
int objc, /* Number of arguments. */
1625+
Tcl_Size objc, /* Number of arguments. */
16261626
Tcl_Obj *const objv[]) /* Argument objects. */
16271627
{
16281628
static const char *const updateOptions[] = {"idletasks", NULL};
@@ -1720,7 +1720,7 @@ int
17201720
Tk_WinfoObjCmd(
17211721
void *clientData, /* Main window associated with interpreter. */
17221722
Tcl_Interp *interp, /* Current interpreter. */
1723-
int objc, /* Number of arguments. */
1723+
Tcl_Size objc, /* Number of arguments. */
17241724
Tcl_Obj *const objv[]) /* Argument objects. */
17251725
{
17261726
int index, x, y, width, height, useX, useY, c_class;
@@ -2008,7 +2008,7 @@ Tk_WinfoObjCmd(
20082008

20092009
case WIN_ATOM:
20102010
skip = TkGetDisplayOf(interp, objc - 2, objv + 2, &tkwin);
2011-
if (skip < 0) {
2011+
if (skip == TCL_INDEX_NONE) {
20122012
return TCL_ERROR;
20132013
}
20142014
if (objc != 3 + skip) {
@@ -2025,7 +2025,7 @@ Tk_WinfoObjCmd(
20252025
Tcl_WideInt id;
20262026

20272027
skip = TkGetDisplayOf(interp, objc - 2, objv + 2, &tkwin);
2028-
if (skip < 0) {
2028+
if (skip == TCL_INDEX_NONE) {
20292029
return TCL_ERROR;
20302030
}
20312031
if (objc != 3 + skip) {
@@ -2049,7 +2049,7 @@ Tk_WinfoObjCmd(
20492049
}
20502050
case WIN_CONTAINING:
20512051
skip = TkGetDisplayOf(interp, objc - 2, objv + 2, &tkwin);
2052-
if (skip < 0) {
2052+
if (skip == TCL_INDEX_NONE) {
20532053
return TCL_ERROR;
20542054
}
20552055
if (objc != 4 + skip) {
@@ -2073,7 +2073,7 @@ Tk_WinfoObjCmd(
20732073
break;
20742074
case WIN_INTERPS:
20752075
skip = TkGetDisplayOf(interp, objc - 2, objv + 2, &tkwin);
2076-
if (skip < 0) {
2076+
if (skip == TCL_INDEX_NONE) {
20772077
return TCL_ERROR;
20782078
}
20792079
if (objc != 2 + skip) {
@@ -2085,7 +2085,7 @@ Tk_WinfoObjCmd(
20852085
Window id;
20862086

20872087
skip = TkGetDisplayOf(interp, objc - 2, objv + 2, &tkwin);
2088-
if (skip < 0) {
2088+
if (skip == TCL_INDEX_NONE) {
20892089
return TCL_ERROR;
20902090
}
20912091
if (objc != 3 + skip) {
@@ -2354,7 +2354,7 @@ int
23542354
TkDeadAppObjCmd(
23552355
TCL_UNUSED(void *),
23562356
Tcl_Interp *interp, /* Current interpreter. */
2357-
TCL_UNUSED(int), /* Number of arguments. */
2357+
TCL_UNUSED(Tcl_Size), /* Number of arguments. */
23582358
Tcl_Obj *const objv[]) /* Argument strings. */
23592359
{
23602360
Tcl_SetObjResult(interp, Tcl_ObjPrintf(

0 commit comments

Comments
 (0)