diff options
| author | treectrl <treectrl> | 2002-12-24 05:47:48 (GMT) |
|---|---|---|
| committer | treectrl <treectrl> | 2002-12-24 05:47:48 (GMT) |
| commit | 1670ae73f2982756df938782d3bf4bcff452a740 (patch) | |
| tree | 86c47f20e5ebb26cb91b8c49582d8adb932e6d6a /generic/tkTreeItem.c | |
| parent | 5056e5be2b18738da808f814e86656da694ac92b (diff) | |
| download | tktreectrl-1670ae73f2982756df938782d3bf4bcff452a740.zip tktreectrl-1670ae73f2982756df938782d3bf4bcff452a740.tar.gz tktreectrl-1670ae73f2982756df938782d3bf4bcff452a740.tar.bz2 | |
Extra checks for visible columns.
Diffstat (limited to 'generic/tkTreeItem.c')
| -rw-r--r-- | generic/tkTreeItem.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/generic/tkTreeItem.c b/generic/tkTreeItem.c index bb9edc7..ce2d0cb 100644 --- a/generic/tkTreeItem.c +++ b/generic/tkTreeItem.c @@ -868,7 +868,7 @@ int TreeItem_FromObj(TreeCtrl *tree, Tcl_Obj *objPtr, TreeItem *itemPtr, int fla } case MOD_VISIBLE: { - break; + goto baditem; } } if (item == NULL) @@ -2854,7 +2854,8 @@ int TreeItemCmd(ClientData clientData, Tcl_Interp *interp, int objc, TreeItem item_ = (TreeItem) item; XRectangle rect; - if (!TreeItem_ReallyVisible(tree, item_)) + if (!TreeItem_ReallyVisible(tree, item_) + || (tree->columnCountVis < 1)) return TCL_OK; Tree_ItemBbox(tree, item_, &x, &y, &w, &h); if (objc > 4) @@ -3591,7 +3592,7 @@ char *TreeItem_Identify(TreeCtrl *tree, TreeItem item_, int x, int y) StyleDrawArgs drawArgs; TreeColumn treeColumn; - if (!TreeItem_ReallyVisible(tree, item_)) + if (!TreeItem_ReallyVisible(tree, item_) || (tree->columnCountVis < 1)) return NULL; Tree_ItemBbox(tree, item_, &left, &top, &width, &height); @@ -3652,7 +3653,7 @@ void TreeItem_Identify2(TreeCtrl *tree, TreeItem item_, StyleDrawArgs drawArgs; TreeColumn treeColumn; - if (!TreeItem_ReallyVisible(tree, item_)) + if (!TreeItem_ReallyVisible(tree, item_) || (tree->columnCountVis < 1)) return; Tree_ItemBbox(tree, item_, &x, &y, &w, &h); |