diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index b07cda318..eaaae09e0 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -14,7 +14,7 @@ env: ERROR_ON_FAILURES: 1 jobs: xcode: - runs-on: macos-15 + runs-on: macos-14 defaults: run: shell: bash @@ -58,7 +58,7 @@ jobs: fi timeout-minutes: 30 clang: - runs-on: macos-15 + runs-on: macos-14 strategy: matrix: symbols: diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml index 680fbdf9f..e4980594e 100644 --- a/.github/workflows/onefiledist.yml +++ b/.github/workflows/onefiledist.yml @@ -12,7 +12,7 @@ permissions: jobs: linux: name: Linux - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 defaults: run: shell: bash diff --git a/changes.md b/changes.md index abe4f01c5..1d82e4504 100644 --- a/changes.md +++ b/changes.md @@ -24,6 +24,8 @@ to the userbase. - [Bug in the ttk::scale widget of the "default" theme](https://core.tcl-lang.org/tk/tktview/126d07) - [Wrong appearance of the ttk::menubutton indicator of the "xpnative" theme](https://core.tcl-lang.org/tk/tktview/525536) - [English shortcuts for Chinese locale](https://core.tcl-lang.org/tk/tktview/c99266) + - [No grip element in ttk::panedwindow sashes of most built-in themes](https://core.tcl-lang.org/tk/tktview/9902d8) + - [Tk_Get3DBorderColors broken by design](https://core.tcl-lang.org/tk/tktview/517165) Release Tk 9.0.1 arises from the check-in with tag `core-9-0-1`. diff --git a/generic/tk3d.c b/generic/tk3d.c index 66c857510..af577595e 100644 --- a/generic/tk3d.c +++ b/generic/tk3d.c @@ -428,9 +428,7 @@ Tk_Free3DBorder( prevPtr = (TkBorder *)Tcl_GetHashValue(borderPtr->hashPtr); TkpFreeBorder(borderPtr); - if (borderPtr->bgColorPtr != NULL) { - Tk_FreeColor(borderPtr->bgColorPtr); - } + Tk_FreeColor(borderPtr->bgColorPtr); if (borderPtr->darkColorPtr != NULL) { Tk_FreeColor(borderPtr->darkColorPtr); } @@ -1422,14 +1420,17 @@ Tk_Get3DBorderColors( XColor *darkColorPtr, XColor *lightColorPtr) { + TkBorder *borderPtr = (TkBorder *)border; + const XColor *colorPtr = borderPtr->bgColorPtr ; + if (bgColorPtr) { - *bgColorPtr = *((TkBorder *)border)->bgColorPtr; + *bgColorPtr = *colorPtr; } if (darkColorPtr) { - *darkColorPtr = *((TkBorder *) border)->darkColorPtr; + *darkColorPtr = borderPtr->darkColorPtr ? *borderPtr->darkColorPtr : *colorPtr; } if (lightColorPtr) { - *lightColorPtr = *((TkBorder *) border)->lightColorPtr; + *lightColorPtr = borderPtr->lightColorPtr ? *borderPtr->lightColorPtr : *colorPtr; } } diff --git a/generic/tkBind.c b/generic/tkBind.c index 7ec574667..303ada3fe 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -3824,9 +3824,9 @@ GetAllVirtualEvents( * an XEvent, constructed from information parsed from the event * description string and its optional arguments. * - * argv[0] contains name of the target window. - * argv[1] contains pattern string for one event (e.g, ). - * argv[2..argc-1] contains -field/option pairs for specifying additional + * objv[0] contains name of the target window. + * objv[1] contains pattern string for one event (e.g, ). + * objv[2..objc-1] contains -field/option pairs for specifying additional * detail in the generated event. * * Either virtual or physical events can be generated this way. The event diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c index 0d08aeca7..c9b6afc33 100644 --- a/generic/tkCanvText.c +++ b/generic/tkCanvText.c @@ -217,7 +217,7 @@ static const Tk_ConfigSpec configSpecs[] = { static void ComputeTextBbox(Tk_Canvas canvas, TextItem *textPtr); static int ConfigureText(Tcl_Interp *interp, - Tk_Canvas canvas, Tk_Item *itemPtr, Tcl_Size argc, + Tk_Canvas canvas, Tk_Item *itemPtr, Tcl_Size objc, Tcl_Obj *const objv[], int flags); static int CreateText(Tcl_Interp *interp, Tk_Canvas canvas, struct Tk_Item *itemPtr, diff --git a/generic/tkEntry.c b/generic/tkEntry.c index 3bedb5c1c..5cbc7f5ad 100644 --- a/generic/tkEntry.c +++ b/generic/tkEntry.c @@ -1086,7 +1086,7 @@ DestroyEntry( * * ConfigureEntry -- * - * This function is called to process an argv/argc list, plus the Tk + * This function is called to process an objv/objc list, plus the Tk * option database, in order to configure (or reconfigure) an entry * widget. * diff --git a/generic/tkFont.c b/generic/tkFont.c index 917a42d27..cc1beb84f 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -3403,7 +3403,7 @@ noMapping: ; * * Side effects: * The fields of the font attributes structure get filled in with - * information from argc/argv. If an error occurs while parsing, the font + * information from objv/objc. If an error occurs while parsing, the font * attributes structure will contain all modifications specified in the * command line options up to the point of the error. * diff --git a/generic/tkImgGIF.c b/generic/tkImgGIF.c index a04196da9..0a842fda7 100644 --- a/generic/tkImgGIF.c +++ b/generic/tkImgGIF.c @@ -424,7 +424,7 @@ FileReadGIF( int fileWidth, fileHeight, imageWidth, imageHeight; unsigned int nBytes; int index = 0, result = TCL_ERROR; - Tcl_Size argc = 0, i; + Tcl_Size objc = 0, i; Tcl_Obj **objv; unsigned char buf[100]; unsigned char *trashBuffer = NULL; @@ -455,16 +455,16 @@ FileReadGIF( */ if (format && Tcl_ListObjGetElements(interp, format, - &argc, &objv) != TCL_OK) { + &objc, &objv) != TCL_OK) { return TCL_ERROR; } - for (i = 1; i < argc; i++) { + for (i = 1; i < objc; i++) { int optionIdx; if (Tcl_GetIndexFromObjStruct(interp, objv[i], optionStrings, sizeof(char *), "option name", 0, &optionIdx) != TCL_OK) { return TCL_ERROR; } - if (i == (argc-1)) { + if (i == (objc-1)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "no value given for \"%s\" option", Tcl_GetString(objv[i]))); diff --git a/generic/tkImgListFormat.c b/generic/tkImgListFormat.c index ab2e27105..d8113c08d 100644 --- a/generic/tkImgListFormat.c +++ b/generic/tkImgListFormat.c @@ -181,7 +181,7 @@ Tk_PhotoImageFormat tkImgFmtDefault = { * Side effects: * The value in *indexPtr is updated to the index of the fist * element in argv[] that does not look like an option/value, or to - * argc if parsing reached the end of argv[]. + * objc if parsing reached the end of argv[]. * *---------------------------------------------------------------------- */ diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index 2a2210fe5..5261c0d6e 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.c @@ -1576,7 +1576,7 @@ GetExtension( * Side effects: * Fields in *optPtr get filled in. The value of optIndexPtr is updated * to contain the index of the first element in argv[] that was not - * parsed, or argc if the end of objv[] was reached. + * parsed, or objc if the end of objv[] was reached. * *---------------------------------------------------------------------- */ diff --git a/generic/tkMain.c b/generic/tkMain.c index f172130a0..17d4a9063 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -261,8 +261,7 @@ Tk_MainEx( if ((argc >= 3) && (0 == _tcscmp(TEXT("-encoding"), argv[1])) && ('-' != argv[3][0])) { Tcl_Obj *value = NewNativeObj(argv[2]); - Tcl_SetStartupScript(NewNativeObj(argv[3]), - Tcl_GetString(value)); + Tcl_SetStartupScript(NewNativeObj(argv[3]), Tcl_GetString(value)); Tcl_DecrRefCount(value); argc -= 3; i += 3; @@ -281,7 +280,7 @@ Tk_MainEx( } Tcl_SetVar2Ex(interp, "argv0", NULL, appName, TCL_GLOBAL_ONLY); - Tcl_SetVar2Ex(interp, "argc", NULL, Tcl_NewWideIntObj((Tcl_WideInt)argc), TCL_GLOBAL_ONLY); + Tcl_SetVar2Ex(interp, "argc", NULL, Tcl_NewWideIntObj(argc), TCL_GLOBAL_ONLY); argvPtr = Tcl_NewListObj(0, NULL); while (argc--) { @@ -308,7 +307,7 @@ Tk_MainEx( } #endif Tcl_SetVar2Ex(interp, "tcl_interactive", NULL, - Tcl_NewWideIntObj(!path && (is.tty || nullStdin)), TCL_GLOBAL_ONLY); + Tcl_NewBooleanObj(!path && (is.tty || nullStdin)), TCL_GLOBAL_ONLY); /* * Invoke application-specific initialization. diff --git a/generic/tkMenu.c b/generic/tkMenu.c index acc11d0bf..cf92a1c14 100644 --- a/generic/tkMenu.c +++ b/generic/tkMenu.c @@ -1560,7 +1560,7 @@ MenuWorldChanged( * * ConfigureMenu -- * - * This function is called to process an argv/argc list, plus the Tk + * This function is called to process an objv/objc list, plus the Tk * option database, in order to configure (or reconfigure) a menu widget. * * Results: @@ -1942,7 +1942,7 @@ PostProcessEntry( * * ConfigureMenuEntry -- * - * This function is called to process an argv/argc list in order to + * This function is called to process an objv/objc list in order to * configure (or reconfigure) one entry in a menu. * * Results: diff --git a/generic/tkMenubutton.c b/generic/tkMenubutton.c index 7096ea12a..7fff7594d 100644 --- a/generic/tkMenubutton.c +++ b/generic/tkMenubutton.c @@ -454,7 +454,7 @@ DestroyMenuButton( * * ConfigureMenuButton -- * - * This function is called to process an argv/argc list, plus the Tk + * This function is called to process an objv/objc list, plus the Tk * option database, in order to configure (or reconfigure) a menubutton * widget. * diff --git a/generic/tkMessage.c b/generic/tkMessage.c index f2580dba4..401de092c 100644 --- a/generic/tkMessage.c +++ b/generic/tkMessage.c @@ -414,7 +414,7 @@ DestroyMessage( * * ConfigureMessage -- * - * This function is called to process an argv/argc list, plus the Tk + * This function is called to process an objv/objc list, plus the Tk * option database, in order to configure (or reconfigure) a message * widget. * diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c index e284edfb3..aa49b6ebe 100644 --- a/generic/tkPanedWindow.c +++ b/generic/tkPanedWindow.c @@ -1227,7 +1227,7 @@ PanedWindowSashCommand( * * ConfigurePanedWindow -- * - * This function is called to process an argv/argc list in conjunction + * This function is called to process an objv/objc list in conjunction * with the Tk option database to configure (or reconfigure) a paned * window widget. * diff --git a/generic/tkPlace.c b/generic/tkPlace.c index 013c5314b..11cbaed5b 100644 --- a/generic/tkPlace.c +++ b/generic/tkPlace.c @@ -593,7 +593,7 @@ FindContainer( * * ConfigureContent -- * - * This function is called to process an argv/argc list to reconfigure + * This function is called to process an objv/objc list to reconfigure * the placement of a window. * * Results: diff --git a/generic/tkScale.c b/generic/tkScale.c index 37950bbc8..ddd087bc7 100644 --- a/generic/tkScale.c +++ b/generic/tkScale.c @@ -573,7 +573,7 @@ DestroyScale( * * ConfigureScale -- * - * This procedure is called to process an argv/argc list, plus the Tk + * This procedure is called to process an objv/objc list, plus the Tk * option database, in order to configure (or reconfigure) a scale * widget. * diff --git a/generic/tkScrollbar.c b/generic/tkScrollbar.c index 16a3f3485..c12d1f8de 100644 --- a/generic/tkScrollbar.c +++ b/generic/tkScrollbar.c @@ -446,7 +446,7 @@ ScrollbarWidgetObjCmd( * * ConfigureScrollbar -- * - * This function is called to process an argv/argc list, plus the Tk + * This function is called to process an objv/objc list, plus the Tk * option database, in order to configure (or reconfigure) a scrollbar * widget. * diff --git a/generic/tkSquare.c b/generic/tkSquare.c index 2c58e3f75..81a912ef5 100644 --- a/generic/tkSquare.c +++ b/generic/tkSquare.c @@ -300,7 +300,7 @@ SquareWidgetObjCmd( * * SquareConfigure -- * - * This procedure is called to process an argv/argc list in conjunction + * This procedure is called to process an objv/objc list in conjunction * with the Tk option database to configure (or reconfigure) a square * widget. * diff --git a/generic/ttk/ttkClamTheme.c b/generic/ttk/ttkClamTheme.c index fd4946448..91c15fc79 100644 --- a/generic/ttk/ttkClamTheme.c +++ b/generic/ttk/ttkClamTheme.c @@ -1182,14 +1182,6 @@ TTK_LAYOUT("TCombobox", TTK_GROUP("Combobox.padding", TTK_FILL_BOTH, TTK_NODE("Combobox.textarea", TTK_FILL_BOTH)))) -TTK_LAYOUT("Horizontal.Sash", - TTK_GROUP("Sash.hsash", TTK_FILL_BOTH, - TTK_NODE("Sash.hgrip", TTK_FILL_BOTH))) - -TTK_LAYOUT("Vertical.Sash", - TTK_GROUP("Sash.vsash", TTK_FILL_BOTH, - TTK_NODE("Sash.vgrip", TTK_FILL_BOTH))) - TTK_END_LAYOUT_TABLE /*------------------------------------------------------------------------ diff --git a/generic/ttk/ttkClassicTheme.c b/generic/ttk/ttkClassicTheme.c index e915e739c..e4dffff04 100644 --- a/generic/ttk/ttkClassicTheme.c +++ b/generic/ttk/ttkClassicTheme.c @@ -856,15 +856,21 @@ TTK_LAYOUT("TSpinbox", TTK_NODE("Spinbox.textarea", TTK_FILL_BOTH))))) /* "classic" scale, includes highlight border */ +TTK_LAYOUT("Horizontal.TScale", + TTK_GROUP("Horizontal.Scale.highlight", TTK_FILL_BOTH, + TTK_GROUP("Horizontal.Scale.trough", TTK_FILL_BOTH, + TTK_NODE("Horizontal.Scale.slider", TTK_PACK_LEFT)))) + TTK_LAYOUT("Vertical.TScale", TTK_GROUP("Vertical.Scale.highlight", TTK_FILL_BOTH, TTK_GROUP("Vertical.Scale.trough", TTK_FILL_BOTH, TTK_NODE("Vertical.Scale.slider", TTK_PACK_TOP)))) -TTK_LAYOUT("Horizontal.TScale", - TTK_GROUP("Horizontal.Scale.highlight", TTK_FILL_BOTH, - TTK_GROUP("Horizontal.Scale.trough", TTK_FILL_BOTH, - TTK_NODE("Horizontal.Scale.slider", TTK_PACK_LEFT)))) +TTK_LAYOUT("Horizontal.Sash", + TTK_NODE("Sash.hsash", TTK_FILL_X)) + +TTK_LAYOUT("Vertical.Sash", + TTK_NODE("Sash.vsash", TTK_FILL_Y)) /* put highlight border around treeview */ TTK_LAYOUT("Treeview", diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c index c996e788a..15f6d5925 100644 --- a/generic/ttk/ttkPanedwindow.c +++ b/generic/ttk/ttkPanedwindow.c @@ -929,7 +929,7 @@ typedef struct { static const Ttk_ElementOptionSpec SashElementOptions[] = { { "-sashthickness", TK_OPTION_PIXELS, - offsetof(SashElement,thicknessObj), "5" }, + offsetof(SashElement,thicknessObj), "3.75p" }, { NULL, TK_OPTION_BOOLEAN, 0, NULL } }; @@ -956,16 +956,89 @@ static const Ttk_ElementSpec SashElementSpec = { TtkNullElementDraw }; +static const int DEFAULT_GRIP_SIZE = 20; + +typedef struct { + Tcl_Obj *borderObj; + Tcl_Obj *gripSizeObj; +} GripElement; + +static const Ttk_ElementOptionSpec GripElementOptions[] = { + { "-background", TK_OPTION_BORDER, + offsetof(GripElement,borderObj), DEFAULT_BACKGROUND }, + { "-gripsize", TK_OPTION_PIXELS, + offsetof(GripElement,gripSizeObj), "15p" }, + { NULL, TK_OPTION_BOOLEAN, 0, NULL } +}; + +static void GripElementSize( + void *clientData, + void *elementRecord, + Tk_Window tkwin, + int *widthPtr, + int *heightPtr, + TCL_UNUSED(Ttk_Padding *)) +{ + Ttk_Orient orient = (Ttk_Orient)PTR2INT(clientData); + GripElement *grip = (GripElement *)elementRecord; + int gripSize = DEFAULT_GRIP_SIZE; + + Tk_GetPixelsFromObj(NULL, tkwin, grip->gripSizeObj, &gripSize); + + if (orient == TTK_ORIENT_HORIZONTAL) { + *widthPtr = gripSize; + } else { + *heightPtr = gripSize; + } +} + +static void GripElementDraw( + void *clientData, + void *elementRecord, + Tk_Window tkwin, + Drawable d, + Ttk_Box b, + TCL_UNUSED(Ttk_State)) +{ + Ttk_Orient orient = (Ttk_Orient)PTR2INT(clientData); + GripElement *grip = (GripElement *)elementRecord; + Tk_3DBorder border = Tk_Get3DBorderFromObj(tkwin, grip->borderObj); + GC darkGC = Tk_3DBorderGC(tkwin, border, TK_3D_DARK_GC); + int gripSize = DEFAULT_GRIP_SIZE, gripPad = 1; + + Tk_GetPixelsFromObj(NULL, tkwin, grip->gripSizeObj, &gripSize); + + if (orient == TTK_ORIENT_HORIZONTAL) { + XFillRectangle(Tk_Display(tkwin), d, darkGC, + b.x + (b.width - gripSize) / 2, b.y + gripPad, + gripSize, b.height - 2 * gripPad); + } else { + XFillRectangle(Tk_Display(tkwin), d, darkGC, + b.x + gripPad, b.y + (b.height - gripSize) / 2, + b.width - 2 * gripPad, gripSize); + } +} + +static const Ttk_ElementSpec GripElementSpec = { + TK_STYLE_VERSION_2, + sizeof(GripElement), + GripElementOptions, + GripElementSize, + GripElementDraw +}; + TTK_BEGIN_LAYOUT(PanedLayout) TTK_NODE("Panedwindow.background", 0)/* @@@ BUG: empty layouts don't work */ TTK_END_LAYOUT TTK_BEGIN_LAYOUT(HorizontalSashLayout) - TTK_NODE("Sash.hsash", TTK_FILL_X) + TTK_GROUP("Sash.hsash", TTK_FILL_BOTH, + TTK_NODE("Sash.hgrip", TTK_FILL_BOTH)) TTK_END_LAYOUT TTK_BEGIN_LAYOUT(VerticalSashLayout) - TTK_NODE("Sash.vsash", TTK_FILL_Y) + TTK_GROUP("Sash.vsash", TTK_FILL_BOTH, + TTK_NODE("Sash.vgrip", TTK_FILL_BOTH)) TTK_END_LAYOUT /*------------------------------------------------------------------------ @@ -980,6 +1053,10 @@ TtkPanedwindow_Init(Tcl_Interp *interp) Ttk_RegisterElement(interp, themePtr, "hsash", &SashElementSpec, 0); Ttk_RegisterElement(interp, themePtr, "vsash", &SashElementSpec, 0); + Ttk_RegisterElement(interp, themePtr, "hgrip", + &GripElementSpec, INT2PTR(TTK_ORIENT_HORIZONTAL)); + Ttk_RegisterElement(interp, themePtr, "vgrip", + &GripElementSpec, INT2PTR(TTK_ORIENT_VERTICAL)); Ttk_RegisterLayout(themePtr, "TPanedwindow", PanedLayout); Ttk_RegisterLayout(themePtr, "Horizontal.Sash", HorizontalSashLayout); diff --git a/macosx/Wish-Info.plist.in b/macosx/Wish-Info.plist.in index 60e60467c..32e9cdad7 100644 --- a/macosx/Wish-Info.plist.in +++ b/macosx/Wish-Info.plist.in @@ -40,13 +40,13 @@ CFBundleTypeRole - Viewer - CFBundleURLSchemes - - foo - - CFBundleURLName - Get Foo + Viewer + CFBundleURLSchemes + + foo + + CFBundleURLName + Get Foo CFBundleExecutable @@ -99,8 +99,8 @@ Wish NSSendTypes - NSStringPboardType - NSPasteboardTypeString + NSStringPboardType + NSPasteboardTypeString diff --git a/tests/filebox.test b/tests/filebox.test index 161e4f53f..37a393c92 100644 --- a/tests/filebox.test +++ b/tests/filebox.test @@ -32,7 +32,7 @@ test fileDialog-0.3 {GetFileName: file types: bad filetype} \ -body { # Checks for the Aqua crash reported in ticket 080a28104. set filename [tk_getOpenFile -filetypes { - {"Invalid extension" {x.y}} + {"Invalid extension" {x.y}} {"All files" {*}} }] } \ diff --git a/tests/focus.test b/tests/focus.test index e1cfe58a1..004706373 100644 --- a/tests/focus.test +++ b/tests/focus.test @@ -45,6 +45,14 @@ proc focusSetupAlt {} { proc focusClear {} { dobg {after 200; focus -force .; update} after 400 + if {[tk windowingsystem] eq "aqua"} { + # In Aqua we need to explicitly wait until focus is cleared. + while {[focus] != ""} { + after 100 {set y 1} + tkwait variable y + } + } + update } diff --git a/tests/ttk/notebook.test b/tests/ttk/notebook.test index 152625b1e..b94fac13d 100644 --- a/tests/ttk/notebook.test +++ b/tests/ttk/notebook.test @@ -93,10 +93,11 @@ test notebook-4.end "Cleanup test suite 1-4.*" -body { destroy .nb } test notebook-5.1 "Virtual events" -body { toplevel .t + update set ::events [list] + pack [set nb [ttk::notebook .t.nb]] -expand true -fill both; update bind .t <> { lappend events changed %W } - pack [set nb [ttk::notebook .t.nb]] -expand true -fill both; update $nb add [frame $nb.f1] ; # triggers <> (first tab gets autoselected) $nb add [frame $nb.f2] $nb add [frame $nb.f3] diff --git a/tests/ttk/panedwindow.test b/tests/ttk/panedwindow.test index 10e118811..149f9726e 100644 --- a/tests/ttk/panedwindow.test +++ b/tests/ttk/panedwindow.test @@ -226,7 +226,7 @@ proc sashpositions {pw} { test paned-sashpos-setup "Setup for sash position test" -body { ttk::style theme use default - ttk::style configure -sashthickness 5 + ttk::style configure Sash -sashthickness 5 ttk::panedwindow .pw .pw add [frame .pw.f1 -width 20 -height 20] @@ -262,7 +262,7 @@ test paned-sashpos-cleanup "Clean up" -body { destroy .pw } test paned-propagation-setup "Setup." -body { ttk::style theme use default - ttk::style configure -sashthickness 5 + ttk::style configure Sash -sashthickness 5 wm geometry . {} ttk::panedwindow .pw -orient vertical diff --git a/win/rc/tk.rc b/win/rc/tk.rc index 6a232369d..04377e1d3 100644 --- a/win/rc/tk.rc +++ b/win/rc/tk.rc @@ -32,19 +32,19 @@ VS_VERSION_INFO VERSIONINFO BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "Tk DLL\0" - VALUE "OriginalFilename", "tk" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) SUFFIX ".dll\0" - VALUE "FileVersion", TK_PATCH_LEVEL - VALUE "LegalCopyright", "Copyright \251 1987-2022 Regents of the University of California and other parties\0" - VALUE "ProductName", "Tk " TK_VERSION " for Windows\0" - VALUE "ProductVersion", TK_PATCH_LEVEL - END + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "Tk DLL\0" + VALUE "OriginalFilename", "tk" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) SUFFIX ".dll\0" + VALUE "FileVersion", TK_PATCH_LEVEL + VALUE "LegalCopyright", "Copyright \251 1987-2022 Regents of the University of California and other parties\0" + VALUE "ProductName", "Tk " TK_VERSION " for Windows\0" + VALUE "ProductVersion", TK_PATCH_LEVEL + END END BLOCK "VarFileInfo" BEGIN - VALUE "Translation", 0x409, 1200 + VALUE "Translation", 0x409, 1200 END END diff --git a/win/rc/tk_base.rc b/win/rc/tk_base.rc index 143ff441a..8725aef30 100644 --- a/win/rc/tk_base.rc +++ b/win/rc/tk_base.rc @@ -27,12 +27,12 @@ BEGIN LTEXT "Directory &name:",-1,8,6,118,9 EDITTEXT edt10,8,26,144,12, WS_TABSTOP | ES_AUTOHSCROLL LISTBOX lst2,8,40,144,64,LBS_SORT | LBS_OWNERDRAWFIXED | - LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | - LBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP + LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | + LBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "Dri&ves:",stc4,8,106,92,9 COMBOBOX cmb2,8,115,144,68,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | - CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | - WS_VSCROLL | WS_TABSTOP + CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | + WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK",1,160,6,50,14,WS_GROUP PUSHBUTTON "Cancel",2,160,24,50,14,WS_GROUP PUSHBUTTON "&Help",psh15,160,42,50,14,WS_GROUP @@ -43,8 +43,8 @@ BEGIN EDITTEXT edt1,7,158,135,20,NOT WS_TABSTOP LISTBOX lst1,8,205,134,42,LBS_NOINTEGRALHEIGHT COMBOBOX cmb1,8,253,135,21,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | - CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | - WS_VSCROLL + CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | + WS_VSCROLL END diff --git a/win/rc/tktest.rc b/win/rc/tktest.rc index 4dfb52205..6ae66a220 100644 --- a/win/rc/tktest.rc +++ b/win/rc/tktest.rc @@ -38,19 +38,19 @@ VS_VERSION_INFO VERSIONINFO BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "Tktest Application\0" - VALUE "OriginalFilename", "tktest" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) SUFFIX ".exe\0" - VALUE "FileVersion", TK_PATCH_LEVEL - VALUE "LegalCopyright", "Copyright \251 1987-2022 Regents of the University of California and other parties\0" - VALUE "ProductName", "Tk " TK_VERSION " for Windows\0" - VALUE "ProductVersion", TK_PATCH_LEVEL - END + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "Tktest Application\0" + VALUE "OriginalFilename", "tktest" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) SUFFIX ".exe\0" + VALUE "FileVersion", TK_PATCH_LEVEL + VALUE "LegalCopyright", "Copyright \251 1987-2022 Regents of the University of California and other parties\0" + VALUE "ProductName", "Tk " TK_VERSION " for Windows\0" + VALUE "ProductVersion", TK_PATCH_LEVEL + END END BLOCK "VarFileInfo" BEGIN - VALUE "Translation", 0x409, 1200 + VALUE "Translation", 0x409, 1200 END END diff --git a/win/rc/wish.rc b/win/rc/wish.rc index 572e82d03..d8445a65b 100644 --- a/win/rc/wish.rc +++ b/win/rc/wish.rc @@ -38,19 +38,19 @@ VS_VERSION_INFO VERSIONINFO BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "Wish Application\0" - VALUE "OriginalFilename", "wish" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) SUFFIX ".exe\0" - VALUE "FileVersion", TK_PATCH_LEVEL - VALUE "LegalCopyright", "Copyright \251 1987-2022 Regents of the University of California and other parties\0" - VALUE "ProductName", "Tk " TK_VERSION " for Windows\0" - VALUE "ProductVersion", TK_PATCH_LEVEL - END + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "Wish Application\0" + VALUE "OriginalFilename", "wish" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) SUFFIX ".exe\0" + VALUE "FileVersion", TK_PATCH_LEVEL + VALUE "LegalCopyright", "Copyright \251 1987-2022 Regents of the University of California and other parties\0" + VALUE "ProductName", "Tk " TK_VERSION " for Windows\0" + VALUE "ProductVersion", TK_PATCH_LEVEL + END END BLOCK "VarFileInfo" BEGIN - VALUE "Translation", 0x409, 1200 + VALUE "Translation", 0x409, 1200 END END