diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-07-16 14:42:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-07-16 14:42:49 (GMT) |
| commit | 3e4e7c117c0a65e2badabfe63f309f09725540dd (patch) | |
| tree | 1aa1865c80a6604d88e2d65cf537440eb3518f7d /generic/ttk/ttkTreeview.c | |
| parent | b532cf528eafbb17cc74d00cc8ca44f429edc33e (diff) | |
| parent | da1c30ff0d8a05251ef3ab0e9f6a5c5bae6f7b14 (diff) | |
| download | tk-3e4e7c117c0a65e2badabfe63f309f09725540dd.zip tk-3e4e7c117c0a65e2badabfe63f309f09725540dd.tar.gz tk-3e4e7c117c0a65e2badabfe63f309f09725540dd.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/ttk/ttkTreeview.c')
| -rw-r--r-- | generic/ttk/ttkTreeview.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c index b17ae45..1ed2742 100644 --- a/generic/ttk/ttkTreeview.c +++ b/generic/ttk/ttkTreeview.c @@ -485,11 +485,11 @@ static void foreachHashEntry(Tcl_HashTable *ht, HashEntryIterator func) } } -/* + unshare(objPtr) -- +/* + unshareObj(objPtr) -- * Ensure that a Tcl_Obj * has refcount 1 -- either return objPtr * itself, or a duplicated copy. */ -static Tcl_Obj *unshare(Tcl_Obj *objPtr) +static Tcl_Obj *unshareObj(Tcl_Obj *objPtr) { if (Tcl_IsShared(objPtr)) { Tcl_Obj *newObj = Tcl_DuplicateObj(objPtr); @@ -2524,7 +2524,7 @@ static int TreeviewSetCommand( } else { /* set column */ int length; - item->valuesObj = unshare(item->valuesObj); + item->valuesObj = unshareObj(item->valuesObj); /* Make sure -values is fully populated: */ @@ -2825,15 +2825,15 @@ static int TreeviewSeeCommand( */ for (parent = item->parent; parent; parent = parent->parent) { if (!(parent->state & TTK_STATE_OPEN)) { - parent->openObj = unshare(parent->openObj); + parent->openObj = unshareObj(parent->openObj); Tcl_SetBooleanObj(parent->openObj, 1); parent->state |= TTK_STATE_OPEN; TtkRedisplayWidget(&tv->core); } } + tv->tree.yscroll.total = CountRows(tv->tree.root) - 1; /* Make sure item is visible: - * @@@ DOUBLE-CHECK THIS: */ rowNumber = RowNumber(tv, item); if (rowNumber < tv->tree.yscroll.first) { |