diff options
author | treectrl <treectrl> | 2003-01-01 21:54:11 (GMT) |
---|---|---|
committer | treectrl <treectrl> | 2003-01-01 21:54:11 (GMT) |
commit | 0258f98d4b6bc495493a1dd12f26922d5edd7349 (patch) | |
tree | c4224dd0908c70db7ae6e12479928f1cf30b397a /generic/tkTreeItem.c | |
parent | a5b6b0090d3422890c0f0fe3d79a4156c7e1eeeb (diff) | |
download | tktreectrl-0258f98d4b6bc495493a1dd12f26922d5edd7349.zip tktreectrl-0258f98d4b6bc495493a1dd12f26922d5edd7349.tar.gz tktreectrl-0258f98d4b6bc495493a1dd12f26922d5edd7349.tar.bz2 |
Fix for 'marquee identify' not reporting column when item has no columns.
Diffstat (limited to 'generic/tkTreeItem.c')
-rw-r--r-- | generic/tkTreeItem.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/generic/tkTreeItem.c b/generic/tkTreeItem.c index a7b7475..83b548b 100644 --- a/generic/tkTreeItem.c +++ b/generic/tkTreeItem.c @@ -3857,7 +3857,7 @@ void TreeItem_Identify2(TreeCtrl *tree, TreeItem item_, totalWidth = 0; treeColumn = tree->columns; column = self->columns; - while (column != NULL) + while (treeColumn != NULL) { if (!TreeColumn_Visible(treeColumn)) columnWidth = 0; @@ -3876,7 +3876,7 @@ void TreeItem_Identify2(TreeCtrl *tree, TreeItem item_, Tcl_Obj *subListObj = Tcl_NewListObj(0, NULL); Tcl_ListObjAppendElement(tree->interp, subListObj, Tcl_NewIntObj(TreeColumn_Index(treeColumn))); - if (column->style != NULL) + if ((column != NULL) && (column->style != NULL)) { drawArgs.style = column->style; drawArgs.x = x + totalWidth + indent; @@ -3891,7 +3891,8 @@ void TreeItem_Identify2(TreeCtrl *tree, TreeItem item_, totalWidth += columnWidth; } treeColumn = TreeColumn_Next(treeColumn); - column = column->next; + if (column != NULL) + column = column->next; } } |