Skip to content

Commit c1e591d

Browse files
author
jan.nijtmans
committed
Tcl_NewWideIntObj -> Tcl_NewBooleanObj (tkMain.c). Some indenting
1 parent 0c31912 commit c1e591d

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

generic/tkMain.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,7 @@ Tk_MainEx(
261261
if ((argc >= 3) && (0 == _tcscmp(TEXT("-encoding"), argv[1]))
262262
&& ('-' != argv[3][0])) {
263263
Tcl_Obj *value = NewNativeObj(argv[2]);
264-
Tcl_SetStartupScript(NewNativeObj(argv[3]),
265-
Tcl_GetString(value));
264+
Tcl_SetStartupScript(NewNativeObj(argv[3]), Tcl_GetString(value));
266265
Tcl_DecrRefCount(value);
267266
argc -= 3;
268267
i += 3;
@@ -281,7 +280,7 @@ Tk_MainEx(
281280
}
282281
Tcl_SetVar2Ex(interp, "argv0", NULL, appName, TCL_GLOBAL_ONLY);
283282

284-
Tcl_SetVar2Ex(interp, "argc", NULL, Tcl_NewWideIntObj((Tcl_WideInt)argc), TCL_GLOBAL_ONLY);
283+
Tcl_SetVar2Ex(interp, "argc", NULL, Tcl_NewWideIntObj(argc), TCL_GLOBAL_ONLY);
285284

286285
argvPtr = Tcl_NewListObj(0, NULL);
287286
while (argc--) {
@@ -308,7 +307,7 @@ Tk_MainEx(
308307
}
309308
#endif
310309
Tcl_SetVar2Ex(interp, "tcl_interactive", NULL,
311-
Tcl_NewWideIntObj(!path && (is.tty || nullStdin)), TCL_GLOBAL_ONLY);
310+
Tcl_NewBooleanObj(!path && (is.tty || nullStdin)), TCL_GLOBAL_ONLY);
312311

313312
/*
314313
* Invoke application-specific initialization.

generic/ttk/ttkPanedwindow.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,9 +1053,9 @@ TtkPanedwindow_Init(Tcl_Interp *interp)
10531053

10541054
Ttk_RegisterElement(interp, themePtr, "hsash", &SashElementSpec, 0);
10551055
Ttk_RegisterElement(interp, themePtr, "vsash", &SashElementSpec, 0);
1056-
Ttk_RegisterElement(interp, themePtr, "hgrip",
1056+
Ttk_RegisterElement(interp, themePtr, "hgrip",
10571057
&GripElementSpec, INT2PTR(TTK_ORIENT_HORIZONTAL));
1058-
Ttk_RegisterElement(interp, themePtr, "vgrip",
1058+
Ttk_RegisterElement(interp, themePtr, "vgrip",
10591059
&GripElementSpec, INT2PTR(TTK_ORIENT_VERTICAL));
10601060

10611061
Ttk_RegisterLayout(themePtr, "TPanedwindow", PanedLayout);

tests/filebox.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ test fileDialog-0.3 {GetFileName: file types: bad filetype} \
3232
-body {
3333
# Checks for the Aqua crash reported in ticket 080a28104.
3434
set filename [tk_getOpenFile -filetypes {
35-
{"Invalid extension" {x.y}}
35+
{"Invalid extension" {x.y}}
3636
{"All files" {*}}
3737
}]
3838
} \

0 commit comments

Comments
 (0)