Skip to content

Commit 60836db

Browse files
author
jan.nijtmans
committed
Rebase to trunk
2 parents 714787e + 3f35e89 commit 60836db

Some content is hidden

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

50 files changed

+237
-225
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@v5
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@v5
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@v5
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@v5
2828
with:
2929
repository: tcltk/tcl
30-
ref: main
30+
ref: tip-626
3131
path: tcl
3232
- name: Setup Environment
3333
run: |
@@ -91,7 +91,7 @@ jobs:
9191
uses: actions/checkout@v5
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@v5
@@ -179,7 +179,7 @@ jobs:
179179
uses: actions/checkout@v5
180180
with:
181181
repository: tcltk/tcl
182-
ref: main
182+
ref: tip-626
183183
path: tcl
184184
- name: Setup Environment
185185
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@v5
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@v5
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
@@ -92,7 +92,7 @@ int
9292
Tk_BellObjCmd(
9393
void *clientData, /* Main window associated with interpreter. */
9494
Tcl_Interp *interp, /* Current interpreter. */
95-
int objc, /* Number of arguments. */
95+
Tcl_Size objc, /* Number of arguments. */
9696
Tcl_Obj *const objv[]) /* Argument objects. */
9797
{
9898
static const char *const bellOptions[] = {
@@ -161,7 +161,7 @@ int
161161
Tk_BindObjCmd(
162162
void *clientData, /* Main window associated with interpreter. */
163163
Tcl_Interp *interp, /* Current interpreter. */
164-
int objc, /* Number of arguments. */
164+
Tcl_Size objc, /* Number of arguments. */
165165
Tcl_Obj *const objv[]) /* Argument objects. */
166166
{
167167
Tk_Window tkwin = (Tk_Window)clientData;
@@ -345,7 +345,7 @@ int
345345
Tk_BindtagsObjCmd(
346346
void *clientData, /* Main window associated with interpreter. */
347347
Tcl_Interp *interp, /* Current interpreter. */
348-
int objc, /* Number of arguments. */
348+
Tcl_Size objc, /* Number of arguments. */
349349
Tcl_Obj *const objv[]) /* Argument objects. */
350350
{
351351
Tk_Window tkwin = (Tk_Window)clientData;
@@ -485,7 +485,7 @@ int
485485
Tk_DestroyObjCmd(
486486
void *clientData, /* Main window associated with interpreter. */
487487
Tcl_Interp *interp, /* Current interpreter. */
488-
int objc, /* Number of arguments. */
488+
Tcl_Size objc, /* Number of arguments. */
489489
Tcl_Obj *const objv[]) /* Argument objects. */
490490
{
491491
Tk_Window window;
@@ -532,7 +532,7 @@ int
532532
Tk_LowerObjCmd(
533533
void *clientData, /* Main window associated with interpreter. */
534534
Tcl_Interp *interp, /* Current interpreter. */
535-
int objc, /* Number of arguments. */
535+
Tcl_Size objc, /* Number of arguments. */
536536
Tcl_Obj *const objv[]) /* Argument objects. */
537537
{
538538
Tk_Window mainwin = (Tk_Window)clientData;
@@ -591,7 +591,7 @@ int
591591
Tk_RaiseObjCmd(
592592
void *clientData, /* Main window associated with interpreter. */
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 objects. */
596596
{
597597
Tk_Window mainwin = (Tk_Window)clientData;
@@ -1013,7 +1013,7 @@ int
10131013
Tk_TkwaitObjCmd(
10141014
void *clientData, /* Main window associated with interpreter. */
10151015
Tcl_Interp *interp, /* Current interpreter. */
1016-
int objc, /* Number of arguments. */
1016+
Tcl_Size objc, /* Number of arguments. */
10171017
Tcl_Obj *const objv[]) /* Argument objects. */
10181018
{
10191019
Tk_Window tkwin = (Tk_Window)clientData;
@@ -1200,7 +1200,7 @@ int
12001200
Tk_UpdateObjCmd(
12011201
TCL_UNUSED(void *), /* Main window associated with interpreter. */
12021202
Tcl_Interp *interp, /* Current interpreter. */
1203-
int objc, /* Number of arguments. */
1203+
Tcl_Size objc, /* Number of arguments. */
12041204
Tcl_Obj *const objv[]) /* Argument objects. */
12051205
{
12061206
static const char *const updateOptions[] = {"idletasks", NULL};
@@ -1298,7 +1298,7 @@ int
12981298
Tk_WinfoObjCmd(
12991299
void *clientData, /* Main window associated with interpreter. */
13001300
Tcl_Interp *interp, /* Current interpreter. */
1301-
int objc, /* Number of arguments. */
1301+
Tcl_Size objc, /* Number of arguments. */
13021302
Tcl_Obj *const objv[]) /* Argument objects. */
13031303
{
13041304
int index, x, y, width, height, useX, useY, c_class;
@@ -1586,7 +1586,7 @@ Tk_WinfoObjCmd(
15861586

15871587
case WIN_ATOM:
15881588
skip = TkGetDisplayOf(interp, objc - 2, objv + 2, &tkwin);
1589-
if (skip < 0) {
1589+
if (skip == TCL_INDEX_NONE) {
15901590
return TCL_ERROR;
15911591
}
15921592
if (objc != 3 + skip) {
@@ -1603,7 +1603,7 @@ Tk_WinfoObjCmd(
16031603
Tcl_WideInt id;
16041604

16051605
skip = TkGetDisplayOf(interp, objc - 2, objv + 2, &tkwin);
1606-
if (skip < 0) {
1606+
if (skip == TCL_INDEX_NONE) {
16071607
return TCL_ERROR;
16081608
}
16091609
if (objc != 3 + skip) {
@@ -1627,7 +1627,7 @@ Tk_WinfoObjCmd(
16271627
}
16281628
case WIN_CONTAINING:
16291629
skip = TkGetDisplayOf(interp, objc - 2, objv + 2, &tkwin);
1630-
if (skip < 0) {
1630+
if (skip == TCL_INDEX_NONE) {
16311631
return TCL_ERROR;
16321632
}
16331633
if (objc != 4 + skip) {
@@ -1651,7 +1651,7 @@ Tk_WinfoObjCmd(
16511651
break;
16521652
case WIN_INTERPS:
16531653
skip = TkGetDisplayOf(interp, objc - 2, objv + 2, &tkwin);
1654-
if (skip < 0) {
1654+
if (skip == TCL_INDEX_NONE) {
16551655
return TCL_ERROR;
16561656
}
16571657
if (objc != 2 + skip) {
@@ -1663,7 +1663,7 @@ Tk_WinfoObjCmd(
16631663
Window id;
16641664

16651665
skip = TkGetDisplayOf(interp, objc - 2, objv + 2, &tkwin);
1666-
if (skip < 0) {
1666+
if (skip == TCL_INDEX_NONE) {
16671667
return TCL_ERROR;
16681668
}
16691669
if (objc != 3 + skip) {
@@ -1932,7 +1932,7 @@ int
19321932
TkDeadAppObjCmd(
19331933
TCL_UNUSED(void *),
19341934
Tcl_Interp *interp, /* Current interpreter. */
1935-
TCL_UNUSED(int), /* Number of arguments. */
1935+
TCL_UNUSED(Tcl_Size), /* Number of arguments. */
19361936
Tcl_Obj *const objv[]) /* Argument strings. */
19371937
{
19381938
Tcl_SetObjResult(interp, Tcl_ObjPrintf(

0 commit comments

Comments
 (0)