diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-06-23 10:25:34 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-06-23 10:25:34 (GMT) |
| commit | 835fa2d511e335babf70b6d19e379ca71938bb2c (patch) | |
| tree | 5769365c580ceba24c618e1345b9bbd56443b987 /generic | |
| parent | 60491df8da63553b1b4251c8ea4022c1ae9f3d12 (diff) | |
| parent | 937cffeb764f1c136933de3e4994d603ee9ec5ed (diff) | |
| download | tk-835fa2d511e335babf70b6d19e379ca71938bb2c.zip tk-835fa2d511e335babf70b6d19e379ca71938bb2c.tar.gz tk-835fa2d511e335babf70b6d19e379ca71938bb2c.tar.bz2 | |
Merge enhanced-index
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkInt.h | 2 | ||||
| -rw-r--r-- | generic/tkSelect.c | 2 | ||||
| -rw-r--r-- | generic/ttk/ttkManager.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h index 470a812..c556706 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -1116,7 +1116,7 @@ MODULE_SCOPE const char *const tkWebColors[20]; #endif /* - * Support for Clang Static Analyzer <http://clang-analyzer.llvm.org> + * Support for Clang Static Analyzer <https://clang-analyzer.llvm.org/> */ #if defined(PURIFY) && defined(__clang__) diff --git a/generic/tkSelect.c b/generic/tkSelect.c index a9064df..c37a320 100644 --- a/generic/tkSelect.c +++ b/generic/tkSelect.c @@ -1191,7 +1191,7 @@ TkSelInit( * Using UTF8_STRING instead of the XA_UTF8_STRING macro allows us to * support older X servers that didn't have UTF8_STRING yet. This is * necessary on Unix systems. For more information, see: - * http://www.cl.cam.ac.uk/~mgk25/unicode.html#x11 + * https://www.cl.cam.ac.uk/~mgk25/unicode.html#x11 */ #if !defined(_WIN32) diff --git a/generic/ttk/ttkManager.c b/generic/ttk/ttkManager.c index 0d41d21..c3257c3 100644 --- a/generic/ttk/ttkManager.c +++ b/generic/ttk/ttkManager.c @@ -452,7 +452,7 @@ int Ttk_GetContentIndexFromObj( /* Try interpreting as an integer first: */ if (TkGetIntForIndex(objPtr, mgr->nContent - 1, 1, &index) == TCL_OK) { - if (index + 1 > mgr->nContent + 1) { + if (index == TCL_INDEX_NONE || index > mgr->nContent) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "Managed window index %d out of bounds", (int)index)); Tcl_SetErrorCode(interp, "TTK", "MANAGED", "INDEX", NULL); |