diff options
| author | culler <culler> | 2017-12-05 16:07:04 (GMT) |
|---|---|---|
| committer | culler <culler> | 2017-12-05 16:07:04 (GMT) |
| commit | 83e0df70bd7b08714d661dcb0a0067669934374f (patch) | |
| tree | 26d51ecfcd25873e6370aed38f735a22d1497a81 /macosx | |
| parent | de0eaeebac1635a66b66ca05dca003f1dad2243a (diff) | |
| parent | ce4655c8c011bae20ec2612e0313a0545bed2942 (diff) | |
| download | tk-83e0df70bd7b08714d661dcb0a0067669934374f.zip tk-83e0df70bd7b08714d661dcb0a0067669934374f.tar.gz tk-83e0df70bd7b08714d661dcb0a0067669934374f.tar.bz2 | |
Merge branch bug-3382424 into core-8-6-branch. Prevents misleading error messages during testing on macOS.
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXEmbed.c | 5 | ||||
| -rw-r--r-- | macosx/tkMacOSXInit.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c index bda4c7c..8348456 100644 --- a/macosx/tkMacOSXEmbed.c +++ b/macosx/tkMacOSXEmbed.c @@ -800,9 +800,12 @@ ContainerEventProc( Tk_ErrorHandler errHandler; if (!firstContainerPtr) { - TkMacOSXDbgMsg("Embedded window has nil container."); + /* + * When the interpreter is being dismantled this can be nil. + */ return; } + /* * Ignore any X protocol errors that happen in this procedure (almost any * operation could fail, for example, if the embedded application has diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index fed81e5..e03b5aa 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -292,7 +292,9 @@ TkpInit( if (Tcl_MacOSXOpenVersionedBundleResources(interp, "com.tcltk.tklibrary", TK_FRAMEWORK_VERSION, 0, PATH_MAX, tkLibPath) != TCL_OK) { + # if 0 /* This is not really an error. Wish still runs fine. */ TkMacOSXDbgMsg("Tcl_MacOSXOpenVersionedBundleResources failed"); + # endif } #endif |