Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Merge 9.0. [5f739d2253] will be handled in separate commit |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | revised_text | tip-466 |
Files: | files | file ages | folders |
SHA3-256: |
d6343387a02875b809ac57b8436d33c6 |
User & Date: | jan.nijtmans 2025-01-28 20:54:37 |
References
2025-01-29
| ||
06:26 | • Ticket [5f739d22] Inconsistency in whether widgets allow negative borderwidths status still Open with 3 other changes artifact: 1a34781d user: fvogel | |
Context
2025-02-01
| ||
13:06 | Fix typo and add comments. check-in: 8709902f user: fvogel tags: revised_text, tip-466 | |
2025-01-28
| ||
20:54 | Merge 9.0. [5f739d2253] will be handled in separate commit check-in: d6343387 user: jan.nijtmans tags: revised_text, tip-466 | |
20:16 | Additional branches should not be added to CI .yml files (please!) check-in: 4426d73c user: jan.nijtmans tags: trunk, main | |
2025-01-20
| ||
06:47 | merge trunk check-in: 4c617794 user: fvogel tags: revised_text, tip-466 | |
Changes
Changes to .github/workflows/mac-build.yml.
︙ | ︙ | |||
10 11 12 13 14 15 16 | - "core-**" permissions: contents: read env: ERROR_ON_FAILURES: 1 jobs: xcode: | | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | - "core-**" permissions: contents: read env: ERROR_ON_FAILURES: 1 jobs: xcode: runs-on: macos-15 defaults: run: shell: bash working-directory: tk/macosx steps: - name: Checkout Tk uses: actions/checkout@v4 |
︙ | ︙ | |||
45 46 47 48 49 50 51 | run: | make all install || { echo "::error::Failure during Build" exit 1 } - name: Run Tests run: | | | | | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | run: | make all install || { echo "::error::Failure during Build" exit 1 } - name: Run Tests run: | make TK_NO_STDERR=1 test | tee out.txt nmatches=$( grep -c "Failed 0" out.txt ) if [ $nmatches -lt 4 ] then echo "::error::Failure during Test" exit 1 fi timeout-minutes: 30 clang: runs-on: macos-15 strategy: matrix: symbols: - 'no' - 'mem' options: - '--enable-aqua' |
︙ | ︙ | |||
140 141 142 143 144 145 146 147 148 149 150 151 152 153 | trap "echo killing process $XVFB_PID... >&2; kill $XVFB_PID" 0 export DISPLAY=$1 sleep 2 } else function runXvfb { echo Xvfb not used, this is a --enable-aqua build } fi ( runXvfb :0; make test-classic; exit $? ) | tee out-classic.txt || { echo "::error::Failure during Test (classic)" exit 1 } ( runXvfb :0; make test-ttk; exit $? ) | tee out-ttk.txt || { | > | 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 | trap "echo killing process $XVFB_PID... >&2; kill $XVFB_PID" 0 export DISPLAY=$1 sleep 2 } else function runXvfb { echo Xvfb not used, this is a --enable-aqua build export TK_NO_STDERR=1 } fi ( runXvfb :0; make test-classic; exit $? ) | tee out-classic.txt || { echo "::error::Failure during Test (classic)" exit 1 } ( runXvfb :0; make test-ttk; exit $? ) | tee out-ttk.txt || { |
︙ | ︙ |
Changes to changes.md.
︙ | ︙ | |||
16 17 18 19 20 21 22 23 24 25 26 27 28 29 | to the userbase. # Bug fixes - [inaccurate scrollbar error-message](https://core.tcl-lang.org/tk/tktview/f88118) - [Build tk 9.0.1 failed on macos 10.13](https://core.tcl-lang.org/tk/tktview/cb5d77) - [image svg upstream out of bound read nanosvg#262](https://core.tcl-lang.org/tk/tktview/121786) - [wm iconbitmap does not correctly set the icon pixmap hint on macOS](https://core.tcl-lang.org/tk/tktview/13ac26) Release Tk 9.0.1 arises from the check-in with tag `core-9-0-1`. Tk 9.0.1 continues the Tk 9.0 series of releases. The Tk 9.0 series does not support Tcl 8.6. The Tk 9.0 series extends the Tcl 9.0 series. To make use of Tk 9.0.1, first a Tcl 9.0 release must be present. As new Tk features are developed, expect them to appear in Tk 9, but not | > > > > | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | to the userbase. # Bug fixes - [inaccurate scrollbar error-message](https://core.tcl-lang.org/tk/tktview/f88118) - [Build tk 9.0.1 failed on macos 10.13](https://core.tcl-lang.org/tk/tktview/cb5d77) - [image svg upstream out of bound read nanosvg#262](https://core.tcl-lang.org/tk/tktview/121786) - [wm iconbitmap does not correctly set the icon pixmap hint on macOS](https://core.tcl-lang.org/tk/tktview/13ac26) - [Backspace crashes 9.0 interpreter on FreeBSD](https://core.tcl-lang.org/tk/tktview/1da19a) - [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) Release Tk 9.0.1 arises from the check-in with tag `core-9-0-1`. Tk 9.0.1 continues the Tk 9.0 series of releases. The Tk 9.0 series does not support Tcl 8.6. The Tk 9.0 series extends the Tcl 9.0 series. To make use of Tk 9.0.1, first a Tcl 9.0 release must be present. As new Tk features are developed, expect them to appear in Tk 9, but not |
︙ | ︙ |
Changes to generic/tkButton.c.
︙ | ︙ | |||
1024 1025 1026 1027 1028 1029 1030 | Tcl_Obj *const objv[]) /* Argument values. */ { Tk_SavedOptions savedOptions; Tcl_Obj *errorResult = NULL; int error, haveImage; Tk_Image image; int wrapLength, borderWidth, highlightWidth, padX, padY; | | | 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 | Tcl_Obj *const objv[]) /* Argument values. */ { Tk_SavedOptions savedOptions; Tcl_Obj *errorResult = NULL; int error, haveImage; Tk_Image image; int wrapLength, borderWidth, highlightWidth, padX, padY; int width, height; /* * Eliminate any existing trace on variables monitored by the button. */ if (butPtr->textVarNamePtr != NULL) { Tcl_UntraceVar2(interp, Tcl_GetString(butPtr->textVarNamePtr), |
︙ | ︙ | |||
1088 1089 1090 1091 1092 1093 1094 | if ((butPtr->state == STATE_ACTIVE) && !Tk_StrictMotif(butPtr->tkwin)) { Tk_SetBackgroundFromBorder(butPtr->tkwin, butPtr->activeBorder); } else { Tk_SetBackgroundFromBorder(butPtr->tkwin, butPtr->normalBorder); } | < < < < < < < | 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 | if ((butPtr->state == STATE_ACTIVE) && !Tk_StrictMotif(butPtr->tkwin)) { Tk_SetBackgroundFromBorder(butPtr->tkwin, butPtr->activeBorder); } else { Tk_SetBackgroundFromBorder(butPtr->tkwin, butPtr->normalBorder); } Tk_GetPixelsFromObj(NULL, butPtr->tkwin, butPtr->borderWidthObj, &borderWidth); if (borderWidth < 0) { borderWidth = 0; Tcl_DecrRefCount(butPtr->borderWidthObj); butPtr->borderWidthObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(butPtr->borderWidthObj); } |
︙ | ︙ | |||
1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 | } Tk_GetPixelsFromObj(NULL, butPtr->tkwin, butPtr->padYObj, &padY); if (padY < 0) { padY = 0; Tcl_DecrRefCount(butPtr->padYObj); butPtr->padYObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(butPtr->padYObj); } if (butPtr->type >= TYPE_CHECK_BUTTON) { Tcl_Obj *valuePtr, *namePtr; if (butPtr->selVarNamePtr == NULL) { butPtr->selVarNamePtr = Tcl_NewStringObj( | > > > > > > > | 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 | } Tk_GetPixelsFromObj(NULL, butPtr->tkwin, butPtr->padYObj, &padY); if (padY < 0) { padY = 0; Tcl_DecrRefCount(butPtr->padYObj); butPtr->padYObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(butPtr->padYObj); } Tk_GetPixelsFromObj(NULL, butPtr->tkwin, butPtr->wrapLengthObj, &wrapLength); if (wrapLength < 0) { wrapLength = 0; Tcl_DecrRefCount(butPtr->wrapLengthObj); butPtr->wrapLengthObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(butPtr->wrapLengthObj); } if (butPtr->type >= TYPE_CHECK_BUTTON) { Tcl_Obj *valuePtr, *namePtr; if (butPtr->selVarNamePtr == NULL) { butPtr->selVarNamePtr = Tcl_NewStringObj( |
︙ | ︙ | |||
1270 1271 1272 1273 1274 1275 1276 | if ((butPtr->bitmap != None) || (butPtr->imagePtr != NULL)) { /* * The button must display the contents of an image or bitmap. */ if (Tk_GetPixelsFromObj(interp, butPtr->tkwin, butPtr->widthObj, | | | | | > > > > > > > > > > | 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 | if ((butPtr->bitmap != None) || (butPtr->imagePtr != NULL)) { /* * The button must display the contents of an image or bitmap. */ if (Tk_GetPixelsFromObj(interp, butPtr->tkwin, butPtr->widthObj, &width) != TCL_OK) { widthError: Tcl_AddErrorInfo(interp, "\n (processing \"-width\" option)"); continue; } if (Tk_GetPixelsFromObj(interp, butPtr->tkwin, butPtr->heightObj, &height) != TCL_OK) { heightError: Tcl_AddErrorInfo(interp, "\n (processing \"-height\" option)"); continue; } } else { /* * The button displays an ordinary text string. */ if (Tcl_GetIntFromObj(interp, butPtr->widthObj, &width) != TCL_OK) { goto widthError; } if (Tcl_GetIntFromObj(interp, butPtr->heightObj, &height) != TCL_OK) { goto heightError; } } if (width < 0) { Tcl_DecrRefCount(butPtr->widthObj); butPtr->widthObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(butPtr->widthObj); } if (height < 0) { Tcl_DecrRefCount(butPtr->heightObj); butPtr->heightObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(butPtr->heightObj); } break; } if (!error) { Tk_FreeSavedOptions(&savedOptions); } /* |
︙ | ︙ |
Changes to generic/tkFrame.c.
︙ | ︙ | |||
982 983 984 985 986 987 988 | if (framePtr->border != NULL) { Tk_SetBackgroundFromBorder(framePtr->tkwin, framePtr->border); } else { Tk_SetWindowBackgroundPixmap(framePtr->tkwin, None); } | | | | | | < < < < < < > > > > > > | 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 | if (framePtr->border != NULL) { Tk_SetBackgroundFromBorder(framePtr->tkwin, framePtr->border); } else { Tk_SetWindowBackgroundPixmap(framePtr->tkwin, None); } Tk_GetPixelsFromObj(NULL, framePtr->tkwin, framePtr->borderWidthObj, &borderWidth); if (borderWidth < 0) { Tcl_DecrRefCount(framePtr->borderWidthObj); framePtr->borderWidthObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(framePtr->borderWidthObj); } Tk_GetPixelsFromObj(NULL, framePtr->tkwin, framePtr->heightObj, &height); if (height < 0) { Tcl_DecrRefCount(framePtr->heightObj); framePtr->heightObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(framePtr->heightObj); } Tk_GetPixelsFromObj(NULL, framePtr->tkwin, framePtr->highlightWidthObj, &highlightWidth); if (highlightWidth < 0) { Tcl_DecrRefCount(framePtr->highlightWidthObj); framePtr->highlightWidthObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(framePtr->highlightWidthObj); } Tk_GetPixelsFromObj(NULL, framePtr->tkwin, framePtr->padXObj, &padX); if (padX < 0) { Tcl_DecrRefCount(framePtr->padXObj); framePtr->padXObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(framePtr->padXObj); } Tk_GetPixelsFromObj(NULL, framePtr->tkwin, framePtr->padYObj, &padY); if (padY < 0) { Tcl_DecrRefCount(framePtr->padYObj); framePtr->padYObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(framePtr->padYObj); } Tk_GetPixelsFromObj(NULL, framePtr->tkwin, framePtr->widthObj, &width); if (width < 0) { Tcl_DecrRefCount(framePtr->widthObj); framePtr->widthObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(framePtr->widthObj); } /* * If a -labelwidget is specified, check that it is valid and set up * geometry management for it. */ |
︙ | ︙ |
Changes to generic/tkIcu.c.
︙ | ︙ | |||
283 284 285 286 287 288 289 290 291 292 293 294 295 296 | if (icu_fns.lib != NULL) { #define ICU_SYM(name) \ strcpy(symbol, "ubrk_" #name ); \ strcat(symbol, icuversion); \ icu_fns.name = (fn_icu_ ## name) \ Tcl_FindSymbol(NULL, icu_fns.lib, symbol) ICU_SYM(open); ICU_SYM(close); ICU_SYM(preceding); ICU_SYM(following); ICU_SYM(previous); ICU_SYM(next); ICU_SYM(setText); #undef ICU_SYM | > > > > > | 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 | if (icu_fns.lib != NULL) { #define ICU_SYM(name) \ strcpy(symbol, "ubrk_" #name ); \ strcat(symbol, icuversion); \ icu_fns.name = (fn_icu_ ## name) \ Tcl_FindSymbol(NULL, icu_fns.lib, symbol) ICU_SYM(open); if (!icu_fns.open && *icuversion) { /* FreeBSD doesn't append the ICU version to the symbol name, see [1da19a69f8] */ *icuversion = 0; ICU_SYM(open); /* try again without version suffix */ } ICU_SYM(close); ICU_SYM(preceding); ICU_SYM(following); ICU_SYM(previous); ICU_SYM(next); ICU_SYM(setText); #undef ICU_SYM |
︙ | ︙ |
Changes to generic/tkMessage.c.
︙ | ︙ | |||
484 485 486 487 488 489 490 | /* * A few other options need special processing, such as setting the * background from a 3-D border or handling special defaults that couldn't * be specified to Tk_ConfigureWidget. */ | < < < < < < < < < | < < | < > > > > > > | 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 | /* * A few other options need special processing, such as setting the * background from a 3-D border or handling special defaults that couldn't * be specified to Tk_ConfigureWidget. */ Tk_GetPixelsFromObj(NULL, msgPtr->tkwin, msgPtr->borderWidthObj, &borderWidth); if (borderWidth < 0) { Tcl_DecrRefCount(msgPtr->borderWidthObj); msgPtr->borderWidthObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(msgPtr->borderWidthObj); } Tk_GetPixelsFromObj(NULL, msgPtr->tkwin, msgPtr->highlightWidthObj, &highlightWidth); if (highlightWidth < 0) { Tcl_DecrRefCount(msgPtr->highlightWidthObj); msgPtr->highlightWidthObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(msgPtr->highlightWidthObj); } if (msgPtr->padXObj) { Tk_GetPixelsFromObj(NULL, msgPtr->tkwin, msgPtr->padXObj, &padX); if (padX < 0) { Tcl_DecrRefCount(msgPtr->padXObj); msgPtr->padXObj = NULL; } } if (msgPtr->padYObj) { Tk_GetPixelsFromObj(NULL, msgPtr->tkwin, msgPtr->padYObj, &padY); if (padY < 0) { Tcl_DecrRefCount(msgPtr->padYObj); msgPtr->padYObj = NULL; } } Tk_GetPixelsFromObj(NULL, msgPtr->tkwin, msgPtr->widthObj, &width); if (width < 0) { Tcl_DecrRefCount(msgPtr->widthObj); msgPtr->widthObj = Tcl_NewIntObj(0); Tcl_IncrRefCount(msgPtr->widthObj); } Tk_FreeSavedOptions(&savedOptions); MessageWorldChanged(msgPtr); return TCL_OK; } |
︙ | ︙ |
Changes to library/msgs/zh_cn.msg.
1 | namespace eval ::tk { | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | # Ticket c992660e: keyboard shortcuts like (&A) should be for an English keyboard added in parenthesis namespace eval ::tk { ::msgcat::mcset zh_cn "&Abort" "中止(&A)" ::msgcat::mcset zh_cn "&About..." "关于……(&A)" ::msgcat::mcset zh_cn "All Files" "所有文件" ::msgcat::mcset zh_cn "Application Error" "应用程序错误" ::msgcat::mcset zh_cn "&Apply" "添加(&A)" ::msgcat::mcset zh_cn "Bold" "粗体" ::msgcat::mcset zh_cn "Bold Italic" "加粗斜体" ::msgcat::mcset zh_cn "&Blue" "蓝色(&B)" ::msgcat::mcset zh_cn "Cancel" "取消" ::msgcat::mcset zh_cn "&Cancel" "取消(&C)" ::msgcat::mcset zh_cn "Cannot change to the directory \"%1\$s\".\nPermission denied." "无法更改目录 \"%1\$s\"。\n访问被拒绝。" ::msgcat::mcset zh_cn "Choose Directory" "选择文件夹" ::msgcat::mcset zh_cn "Cl&ear" "清除(&E)" ::msgcat::mcset zh_cn "&Clear Console" "清除终端(&C)" ::msgcat::mcset zh_cn "Color" "颜色" ::msgcat::mcset zh_cn "Console" "终端" ::msgcat::mcset zh_cn "&Copy" "复制(&C)" ::msgcat::mcset zh_cn "Cu&t" "剪切(&T)" ::msgcat::mcset zh_cn "&Delete" "删除(&D)" ::msgcat::mcset zh_cn "Details >>" "详细信息 >>" ::msgcat::mcset zh_cn "Directory \"%1\$s\" does not exist." "目录 \"%1\$s\" 不存在。" ::msgcat::mcset zh_cn "&Directory:" "目录(&D):" ::msgcat::mcset zh_cn "&Edit" "编辑(&E)" ::msgcat::mcset zh_cn "Effects" "效果" ::msgcat::mcset zh_cn "Error: %1\$s" "错误: %1\$s" ::msgcat::mcset zh_cn "E&xit" "退出(&X)" ::msgcat::mcset zh_cn "&File" "文件(&F)" ::msgcat::mcset zh_cn "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "文件 \"%1\$s\" 已经存在。\n您想要覆盖它吗?" ::msgcat::mcset zh_cn "File \"%1\$s\" already exists.\n\n" "文件 \"%1\$s\" 已经存在。\n\n" ::msgcat::mcset zh_cn "File \"%1\$s\" does not exist." "文件 \"%1\$s\" 不存在。" ::msgcat::mcset zh_cn "File &name:" "文件名(&N):" ::msgcat::mcset zh_cn "File &names:" "文件&名(&N):" ::msgcat::mcset zh_cn "Files of &type:" "文件类型(&T):" ::msgcat::mcset zh_cn "Fi&les:" "文件(&L):" ::msgcat::mcset zh_cn "&Filter" "过滤(&F)" ::msgcat::mcset zh_cn "Fil&ter:" "过滤(&T):" ::msgcat::mcset zh_cn "Font" "字体" ::msgcat::mcset zh_cn "&Font:" "字体(&G):" ::msgcat::mcset zh_cn "Font st&yle:" "字体样式(&Y):" ::msgcat::mcset zh_cn "&Green" "绿色(&G)" ::msgcat::mcset zh_cn "&Help" "帮助(&H)" ::msgcat::mcset zh_cn "Hi" "你好" ::msgcat::mcset zh_cn "&Hide Console" "隐藏终端(&H)" ::msgcat::mcset zh_cn "&Ignore" "忽略(&I)" ::msgcat::mcset zh_cn "Invalid file name \"%1\$s\"." "无效的文件名 \"%1\$s\"。" ::msgcat::mcset zh_cn "Italic" "斜体" ::msgcat::mcset zh_cn "Log Files" "日志文件" ::msgcat::mcset zh_cn "&No" "否(&N)" ::msgcat::mcset zh_cn "&OK" "确定(&O)" ::msgcat::mcset zh_cn "OK" "确定" ::msgcat::mcset zh_cn "Ok" "确定" ::msgcat::mcset zh_cn "Open" "打开" ::msgcat::mcset zh_cn "&Open" "打开(&O)" ::msgcat::mcset zh_cn "Open Multiple Files" "打开多个文件" ::msgcat::mcset zh_cn "P&aste" "粘贴(&A)" ::msgcat::mcset zh_cn "&Quit" "退出(&Q)" ::msgcat::mcset zh_cn "&Red" "红色(&R)" ::msgcat::mcset zh_cn "Regular" "规则" ::msgcat::mcset zh_cn "Replace existing file?" "替换已有文件?" ::msgcat::mcset zh_cn "&Retry" "重试(&R)" ::msgcat::mcset zh_cn "Sample" "样式" ::msgcat::mcset zh_cn "&Save" "保存(&S)" ::msgcat::mcset zh_cn "Save As" "另存为" ::msgcat::mcset zh_cn "Save To Log" "保存到日志" ::msgcat::mcset zh_cn "Select Log File" "选择日志文件" ::msgcat::mcset zh_cn "Select a file to source" "选择一个源文件" ::msgcat::mcset zh_cn "&Selection:" "选择(&S):" ::msgcat::mcset zh_cn "&Size:" "大小(&S):" ::msgcat::mcset zh_cn "Show &Hidden Directories" "显示隐藏目录(&H)" ::msgcat::mcset zh_cn "Show &Hidden Files and Directories" "显示隐藏文件和目录(&H)" ::msgcat::mcset zh_cn "Skip Messages" "跳过信息" ::msgcat::mcset zh_cn "&Source..." "来源……(&S)" ::msgcat::mcset zh_cn "Stri&keout" "删除线(&K)" ::msgcat::mcset zh_cn "Tcl Scripts" "Tcl脚本" ::msgcat::mcset zh_cn "Tcl for Windows" "适用于Windows的Tcl" ::msgcat::mcset zh_cn "Text Files" "文本文档" ::msgcat::mcset zh_cn "&Underline" "下划线(&U)" ::msgcat::mcset zh_cn "&Yes" "确定(&Y)" ::msgcat::mcset zh_cn "abort" "中止" ::msgcat::mcset zh_cn "blue" "蓝色" ::msgcat::mcset zh_cn "cancel" "取消" ::msgcat::mcset zh_cn "extension" "拓展" ::msgcat::mcset zh_cn "extensions" "拓展" ::msgcat::mcset zh_cn "green" "绿色" ::msgcat::mcset zh_cn "ignore" "忽略" |
︙ | ︙ |
Changes to macosx/tkMacOSXDialog.c.
︙ | ︙ | |||
33 34 35 36 37 38 39 | { #if MAC_OS_X_VERSION_MAX_ALLOWED >= 110000 /* UTType exists in the SDK */ if (@available(macOS 11.0, *)) { NSMutableArray<UTType *> *allowedTypes = [NSMutableArray array]; for (NSString *ext in extensions) { UTType *uttype = [UTType typeWithFilenameExtension: ext]; | > | > | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | { #if MAC_OS_X_VERSION_MAX_ALLOWED >= 110000 /* UTType exists in the SDK */ if (@available(macOS 11.0, *)) { NSMutableArray<UTType *> *allowedTypes = [NSMutableArray array]; for (NSString *ext in extensions) { UTType *uttype = [UTType typeWithFilenameExtension: ext]; if (uttype) { [allowedTypes addObject:uttype]; } } [panel setAllowedContentTypes:allowedTypes]; } else { # if MAC_OS_X_VERSION_MIN_REQUIRED < 110000 /* setAllowedFileTypes is not deprecated */ [panel setAllowedFileTypes:extensions]; #endif |
︙ | ︙ | |||
80 81 82 83 84 85 86 87 88 89 90 91 92 93 | /* * Only one of these is needed for the application, so they can be static. */ static filepanelFilterInfo filterInfo; static NSOpenPanel *openpanel; static NSSavePanel *savepanel; static const char *const colorOptionStrings[] = { "-initialcolor", "-parent", "-title", NULL }; enum colorOptions { COLOR_INITIAL, COLOR_PARENT, COLOR_TITLE }; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 | /* * Only one of these is needed for the application, so they can be static. */ static filepanelFilterInfo filterInfo; static NSOpenPanel *openpanel; static NSSavePanel *savepanel; /* * A thread which closes the currently running modal dialog after a timeout. */ @interface TKPanelMonitor: NSThread { @private NSTimeInterval _timeout; } - (id) initWithTimeout: (NSTimeInterval) timeout; @end @implementation TKPanelMonitor: NSThread - (id) initWithTimeout: (NSTimeInterval) timeout { self = [super init]; if (self) { _timeout = timeout; return self; } return self; } - (void) main { [NSThread sleepForTimeInterval:_timeout]; if ([self isCancelled]) { [NSThread exit]; } [NSApp stopModalWithCode:modalCancel]; } @end static const char *const colorOptionStrings[] = { "-initialcolor", "-parent", "-title", NULL }; enum colorOptions { COLOR_INITIAL, COLOR_PARENT, COLOR_TITLE }; |
︙ | ︙ | |||
864 865 866 867 868 869 870 | if (haveParentOption) { parent = TkMacOSXGetNSWindowForDrawable(((TkWindow *)tkwin)->window); parentIsKey = parent && [parent isKeyWindow]; } else { parent = nil; parentIsKey = False; } | > > > > > > > > > | > > > > | 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 | if (haveParentOption) { parent = TkMacOSXGetNSWindowForDrawable(((TkWindow *)tkwin)->window); parentIsKey = parent && [parent isKeyWindow]; } else { parent = nil; parentIsKey = False; } TKPanelMonitor *monitor; if (testsAreRunning) { /* * We need the panel to close by itself when running tests. */ monitor = [[TKPanelMonitor alloc] initWithTimeout: 1.0]; [monitor start]; } modalReturnCode = showOpenSavePanel(openpanel, parent, interp, cmdObj, multiple); if (testsAreRunning) { [monitor cancel]; } if (cmdObj) { Tcl_DecrRefCount(cmdObj); } result = (modalReturnCode != modalError) ? TCL_OK : TCL_ERROR; if (parentIsKey) { [parent makeKeyWindow]; } |
︙ | ︙ |
Changes to macosx/tkMacOSXInit.c.
︙ | ︙ | |||
17 18 19 20 21 22 23 24 25 26 27 28 29 30 | #include "tkMacOSXConstants.h" #include "tkMacOSXWm.h" #include <dlfcn.h> #include <objc/objc-auto.h> #include <sys/stat.h> #include <sys/utsname.h> static char tkLibPath[PATH_MAX + 1] = ""; /* * If the App is in an App package, then we want to add the Scripts directory * to the auto_path. */ | > > > > > > | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | #include "tkMacOSXConstants.h" #include "tkMacOSXWm.h" #include <dlfcn.h> #include <objc/objc-auto.h> #include <sys/stat.h> #include <sys/utsname.h> /* * This flag is set if tests are being run. */ int testsAreRunning = 0; static char tkLibPath[PATH_MAX + 1] = ""; /* * If the App is in an App package, then we want to add the Scripts directory * to the auto_path. */ |
︙ | ︙ | |||
41 42 43 44 45 46 47 48 49 50 51 52 53 54 | @implementation TKApplication @synthesize poolLock = _poolLock; @synthesize macOSVersion = _macOSVersion; @synthesize tkLiveResizeEnded = _tkLiveResizeEnded; @synthesize tkWillExit = _tkWillExit; @synthesize tkPointerWindow = _tkPointerWindow; - (void) setTkPointerWindow: (TkWindow *)winPtr { if (winPtr) { Tcl_Preserve(winPtr); } if (_tkPointerWindow) { Tcl_Release(_tkPointerWindow); | > | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | @implementation TKApplication @synthesize poolLock = _poolLock; @synthesize macOSVersion = _macOSVersion; @synthesize tkLiveResizeEnded = _tkLiveResizeEnded; @synthesize tkWillExit = _tkWillExit; @synthesize tkPointerWindow = _tkPointerWindow; - (void) setTkPointerWindow: (TkWindow *)winPtr { if (winPtr) { Tcl_Preserve(winPtr); } if (_tkPointerWindow) { Tcl_Release(_tkPointerWindow); |
︙ | ︙ |
Changes to macosx/tkMacOSXPrivate.h.
︙ | ︙ | |||
130 131 132 133 134 135 136 137 138 139 140 141 142 143 | #define TkMacOSXInitNamedSymbol(module, ret, symbol, ...) \ static ret (* symbol)(__VA_ARGS__) = UNINITIALISED_SYMBOL; \ if (symbol == UNINITIALISED_SYMBOL) { \ symbol = TkMacOSXGetNamedSymbol(STRINGIFY(module), \ STRINGIFY(symbol)); \ } /* * The structure of a 32-bit XEvent keycode on macOS. It may be viewed as * an unsigned int or as having either two or three bitfields. */ typedef struct keycode_v_t { unsigned keychar: 22; /* UCS-32 character */ | > > > > > > | 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 | #define TkMacOSXInitNamedSymbol(module, ret, symbol, ...) \ static ret (* symbol)(__VA_ARGS__) = UNINITIALISED_SYMBOL; \ if (symbol == UNINITIALISED_SYMBOL) { \ symbol = TkMacOSXGetNamedSymbol(STRINGIFY(module), \ STRINGIFY(symbol)); \ } /* * This is set to 1 if tests are being run. Defined in tkMacOSXInit.c. */ extern int testsAreRunning; /* * The structure of a 32-bit XEvent keycode on macOS. It may be viewed as * an unsigned int or as having either two or three bitfields. */ typedef struct keycode_v_t { unsigned keychar: 22; /* UCS-32 character */ |
︙ | ︙ |
Changes to macosx/tkMacOSXTest.c.
︙ | ︙ | |||
12 13 14 15 16 17 18 | * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tkMacOSXPrivate.h" #include "tkMacOSXConstants.h" #include "tkMacOSXWm.h" | < | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tkMacOSXPrivate.h" #include "tkMacOSXConstants.h" #include "tkMacOSXWm.h" /* * Forward declarations of procedures defined later in this file: */ static Tcl_ObjCmdProc TestpressbuttonObjCmd; static Tcl_ObjCmdProc TestmovemouseObjCmd; static Tcl_ObjCmdProc TestinjectkeyeventObjCmd; |
︙ | ︙ | |||
44 45 46 47 48 49 50 51 52 53 54 55 56 57 | *---------------------------------------------------------------------- */ int TkplatformtestInit( Tcl_Interp *interp) /* Interpreter to add commands to. */ { /* * Add commands for platform specific tests on MacOS here. */ Tcl_CreateObjCommand(interp, "testpressbutton", TestpressbuttonObjCmd, NULL, NULL); Tcl_CreateObjCommand(interp, "testmovemouse", TestmovemouseObjCmd, NULL, NULL); Tcl_CreateObjCommand(interp, "testinjectkeyevent", TestinjectkeyeventObjCmd, NULL, NULL); | > > > > > > | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | *---------------------------------------------------------------------- */ int TkplatformtestInit( Tcl_Interp *interp) /* Interpreter to add commands to. */ { /* * Set a flag indicating that testing is in progress. */ testsAreRunning = 1; /* * Add commands for platform specific tests on MacOS here. */ Tcl_CreateObjCommand(interp, "testpressbutton", TestpressbuttonObjCmd, NULL, NULL); Tcl_CreateObjCommand(interp, "testmovemouse", TestmovemouseObjCmd, NULL, NULL); Tcl_CreateObjCommand(interp, "testinjectkeyevent", TestinjectkeyeventObjCmd, NULL, NULL); |
︙ | ︙ |
Changes to tests/filebox.test.
︙ | ︙ | |||
19 20 21 22 23 24 25 26 27 28 29 30 31 32 | test fileDialog-0.2 {GetFileName: file types: MakeFilter() fails} { # MacOS type that is too short, but looks ok in utf (4 bytes). set x [catch {tk_getSaveFile -filetypes {{"foo" .foo {\0\0}}}} msg] regsub -all "\0" $msg {\\0} msg list $x $msg } {1 {bad Macintosh file type "\0\0"}} set tk_strictMotif_old $tk_strictMotif #---------------------------------------------------------------------- # # Procedures needed by this test file # | > > > > > > > > > > > > > > | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | test fileDialog-0.2 {GetFileName: file types: MakeFilter() fails} { # MacOS type that is too short, but looks ok in utf (4 bytes). set x [catch {tk_getSaveFile -filetypes {{"foo" .foo {\0\0}}}} msg] regsub -all "\0" $msg {\\0} msg list $x $msg } {1 {bad Macintosh file type "\0\0"}} # The next test must actually open a file dialog window, but it does # not require human interaction to close the dialog because the Aqua # port of tktest automatically closes every file dialog after a short # timeout when tests are being run. test fileDialog-0.3 {GetFileName: file types: bad filetype} \ -constraints aqua \ -body { # Checks for the Aqua crash reported in ticket 080a28104. set filename [tk_getOpenFile -filetypes { {"Invalid extension" {x.y}} {"All files" {*}} }] } \ -result {} set tk_strictMotif_old $tk_strictMotif #---------------------------------------------------------------------- # # Procedures needed by this test file # |
︙ | ︙ |
Changes to tests/text.test.
︙ | ︙ | |||
3798 3799 3800 3801 3802 3803 3804 | } -cleanup { destroy .top } -result {150x140+} # This test was failing Windows because the title bar on .t was a certain # minimum size and it was interfering with the size requested by the -setgrid. # The "overrideredirect" gets rid of the titlebar so the toplevel can shrink # to the appropriate size. | | > > > > | | 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 | } -cleanup { destroy .top } -result {150x140+} # This test was failing Windows because the title bar on .t was a certain # minimum size and it was interfering with the size requested by the -setgrid. # The "overrideredirect" gets rid of the titlebar so the toplevel can shrink # to the appropriate size. # On macOS, however, there is no way to make the window overlap the # menubar. Starting with macOS 15 (Sequoia) it became impossible for # the y coordinate of the top of a window to be less than 10 plus the # menubar height (as reported by [[NSApp mainMenu] menuBarHeight]). if {[tk windowingsystem] eq "aqua"} { set minY [expr [testmenubarheight] + 11] } else { set minY 0 } test text-14.19 {ConfigureText procedure} -setup { toplevel .top text .top.t -font {Courier -12} -borderwidth 2 -highlightthickness 2 } -body { |
︙ | ︙ |
Changes to tests/unixWm.test.
︙ | ︙ | |||
32 33 34 35 36 37 38 | update } } # On macOS windows are not allowed to overlap the menubar at the top of the # screen or the dock. So tests which move a window and then check whether it # got moved to the requested location should use a y coordinate larger than the | | | > > > | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | update } } # On macOS windows are not allowed to overlap the menubar at the top of the # screen or the dock. So tests which move a window and then check whether it # got moved to the requested location should use a y coordinate larger than the # height of the menubar (normally 23 pixels) and an x coordinate larger than # the width of the dock, if it happens to be on the left. Starting with # macOS 15 (Sequoia) it became impossible for the y coordinate of the top # of a window to be less than 10 plus the menubar height (as reported by # [[NSApp mainMenu] menuBarHeight]). if {[tk windowingsystem] eq "aqua"} { set mb [expr [testmenubarheight] + 11] set X 100 set Y0 $mb set Y2 [expr $mb + 2] set Y5 [expr $mb + 5] } else { set X 20 set Y0 0 |
︙ | ︙ |
Changes to win/ttkWinXPTheme.c.
︙ | ︙ | |||
1131 1132 1133 1134 1135 1136 1137 | { "tab", &TabElementSpec, L"TAB", TABP_TABITEM, tabitem_statemap, PAD(3,3,3,0), 0 }, { "client", &GenericElementSpec, L"TAB", TABP_PANE, null_statemap, PAD(1,1,3,3), 0 }, { "NotebookPane.background", &GenericElementSpec, L"TAB", TABP_BODY, null_statemap, NOPAD, 0 }, { "Toolbutton.border", &GenericElementSpec, L"TOOLBAR", | | | | | > | | | | | 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 | { "tab", &TabElementSpec, L"TAB", TABP_TABITEM, tabitem_statemap, PAD(3,3,3,0), 0 }, { "client", &GenericElementSpec, L"TAB", TABP_PANE, null_statemap, PAD(1,1,3,3), 0 }, { "NotebookPane.background", &GenericElementSpec, L"TAB", TABP_BODY, null_statemap, NOPAD, 0 }, { "Toolbutton.border", &GenericElementSpec, L"TOOLBAR", TP_BUTTON, toolbutton_statemap, NOPAD, 0 }, { "Menubutton.button", &GenericElementSpec, L"TOOLBAR", TP_SPLITBUTTON, toolbutton_statemap, NOPAD, 0 }, { "Menubutton.dropdown", &GenericSizedElementSpec, L"TOOLBAR", TP_SPLITBUTTONDROPDOWN, toolbutton_statemap, NOPAD, (SM_CXVSCROLL << 8) | SM_CYVSCROLL }, { "Treeview.field", &GenericElementSpec, L"TREEVIEW", TVP_TREEITEM, treeview_statemap, PAD(1, 1, 1, 1), IGNORE_THEMESIZE }, { "Treeitem.indicator", &TreeIndicatorElementSpec, L"TREEVIEW", TVP_GLYPH, tvpglyph_statemap, PAD(1,1,6,0), PAD_MARGINS }, { "Treeheading.border", &GenericElementSpec, L"HEADER", HP_HEADERITEM, header_statemap, PAD(4,0,4,0), 0 }, { "sizegrip", &GenericElementSpec, L"STATUS", SP_GRIPPER, null_statemap, NOPAD, 0 }, { "Spinbox.field", &GenericElementSpec, L"EDIT", EP_EDITTEXT, edittext_statemap, PAD(1, 1, 1, 1), 0 }, { "Spinbox.uparrow", &SpinboxArrowElementSpec, L"SPIN", SPNP_UP, spinbutton_statemap, NOPAD, PAD_MARGINS | ((SM_CXVSCROLL << 8) | SM_CYVSCROLL) }, { "Spinbox.downarrow", &SpinboxArrowElementSpec, L"SPIN", SPNP_DOWN, spinbutton_statemap, NOPAD, PAD_MARGINS | ((SM_CXVSCROLL << 8) | SM_CYVSCROLL) }, #ifdef BROKEN_TEXT_ELEMENT { "Labelframe.text", &TextElementSpec, L"BUTTON", BP_GROUPBOX, groupbox_statemap, NOPAD, 0 }, #endif { 0, 0, 0, 0, 0, NOPAD, 0 } }; #undef PAD static int GetSysFlagFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *resultPtr) { |
︙ | ︙ |