diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-20 10:45:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-20 10:45:49 (GMT) |
| commit | 6fb78493c08598f261c7b8b6d5bb320cd58f27e0 (patch) | |
| tree | 51ba887f9bd055ce85d72a7c73377bcaa263b66d /generic | |
| parent | 8d11cc8eacd0e8ba40c491c14435adce2a969075 (diff) | |
| parent | d6b9036b665ab06fcb218295a69a011b385c9609 (diff) | |
| download | tk-6fb78493c08598f261c7b8b6d5bb320cd58f27e0.zip tk-6fb78493c08598f261c7b8b6d5bb320cd58f27e0.tar.gz tk-6fb78493c08598f261c7b8b6d5bb320cd58f27e0.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkImgListFormat.c | 3 | ||||
| -rw-r--r-- | generic/tkMenu.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/generic/tkImgListFormat.c b/generic/tkImgListFormat.c index 0a4435c..2b23699 100644 --- a/generic/tkImgListFormat.c +++ b/generic/tkImgListFormat.c @@ -158,7 +158,8 @@ Tk_PhotoImageFormat tkImgFmtDefault = { NULL, /* fileReadProc: format doesn't support file read */ StringReadDef, /* stringReadProc */ NULL, /* fileWriteProc: format doesn't support file write */ - StringWriteDef /* stringWriteProc */ + StringWriteDef, /* stringWriteProc */ + NULL /* nextPtr */ }; /* diff --git a/generic/tkMenu.c b/generic/tkMenu.c index 1b38444..4c58981 100644 --- a/generic/tkMenu.c +++ b/generic/tkMenu.c @@ -759,7 +759,7 @@ MenuWidgetObjCmd( first = 1; } - if ((first < 0) || (last < first)) { + if ((first == TCL_INDEX_NONE) || (last < first)) { goto done; } DeleteMenuCloneEntries(menuPtr, first, last); |