diff options
| author | treectrl <treectrl> | 2006-11-06 01:47:47 (GMT) |
|---|---|---|
| committer | treectrl <treectrl> | 2006-11-06 01:47:47 (GMT) |
| commit | f02095e338d3d5a60fc16e01bb90bfa704cd9b33 (patch) | |
| tree | b511c876b70761e0108161905e55c91b580e6053 /generic/tkTreeDrag.c | |
| parent | 0739c63aecc79a33541805cc5f154b4e96bcd222 (diff) | |
| download | tktreectrl-f02095e338d3d5a60fc16e01bb90bfa704cd9b33.zip tktreectrl-f02095e338d3d5a60fc16e01bb90bfa704cd9b33.tar.gz tktreectrl-f02095e338d3d5a60fc16e01bb90bfa704cd9b33.tar.bz2 | |
Avoid unnecessary calculation of column offset.
Remove forgotten line of code.
Diffstat (limited to 'generic/tkTreeDrag.c')
| -rw-r--r-- | generic/tkTreeDrag.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/generic/tkTreeDrag.c b/generic/tkTreeDrag.c index 847817d..be79ca9 100644 --- a/generic/tkTreeDrag.c +++ b/generic/tkTreeDrag.c @@ -5,7 +5,7 @@ * * Copyright (c) 2002-2006 Tim Baker * - * RCS: @(#) $Id: tkTreeDrag.c,v 1.18 2006/10/14 19:53:28 treectrl Exp $ + * RCS: @(#) $Id: tkTreeDrag.c,v 1.19 2006/11/06 01:47:47 treectrl Exp $ */ #include "tkTreeCtrl.h" @@ -435,7 +435,8 @@ DragImageCmd( * early without needing to check those arguments. */ if (objc > 4) { - if (TreeItem_ColumnFromObj(tree, item, objv[4], &itemColumn, &columnIndex) != TCL_OK) + if (TreeItem_ColumnFromObj(tree, item, objv[4], &itemColumn, + &columnIndex) != TCL_OK) return TCL_ERROR; if (objc > 5) { @@ -479,13 +480,7 @@ DragImageCmd( if (!TreeColumn_Visible(treeColumn)) goto doneAdd; drawArgs.style = TreeItemColumn_GetStyle(tree, itemColumn); - totalWidth = 0; - treeColumn = tree->columns; - for (i = 0; i < columnIndex; i++) - { - totalWidth += TreeColumn_UseWidth(treeColumn); - treeColumn = TreeColumn_Next(treeColumn); - } + totalWidth = TreeColumn_Offset(treeColumn); if (treeColumn == tree->columnTree) indent = TreeItem_Indent(tree, item); else @@ -494,7 +489,6 @@ DragImageCmd( drawArgs.x = x + totalWidth; drawArgs.width = TreeColumn_UseWidth(treeColumn); drawArgs.justify = TreeColumn_Justify(treeColumn); - if (objc - 5 > STATIC_SIZE) STATIC_ALLOC(rects, XRectangle, objc - 5); count = TreeStyle_GetElemRects(&drawArgs, objc - 5, objv + 5, rects); if (count == -1) |