From 476816debadb98f7ec8a56b0ae6d5d979a1be029 Mon Sep 17 00:00:00 2001
From: treectrl <treectrl>
Date: Tue, 21 Nov 2006 02:00:54 +0000
Subject: Use the new [bbox] command.

---
 library/treectrl.tcl | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/library/treectrl.tcl b/library/treectrl.tcl
index 8ed4d92..84be0e9 100644
--- a/library/treectrl.tcl
+++ b/library/treectrl.tcl
@@ -1,4 +1,4 @@
-# RCS: @(#) $Id: treectrl.tcl,v 1.36 2006/11/19 23:46:13 treectrl Exp $
+# RCS: @(#) $Id: treectrl.tcl,v 1.37 2006/11/21 02:00:54 treectrl Exp $
 
 bind TreeCtrl <Motion> {
     TreeCtrl::CursorCheck %W %x %y
@@ -265,22 +265,12 @@ proc ::TreeCtrl::ColumnDragFindBefore {w x y dragColumn indColumn_ indSide_} {
     upvar $indColumn_ indColumn
     upvar $indSide_ indSide
 
-    scan [$w contentbox] "%d %d %d %d" x1 y1 x2 y2
-    set lock [$w column cget $dragColumn -lock]
-    switch -- $lock {
-	left {
-	    set minX 0 ; # FIXME: plus borders
-	    set maxX $x1
-	}
-	none {
-	    set minX $x1
-	    set maxX $x2
-	}
-	right {
-	    set minX $x2
-	    set maxX [winfo width $w] ; # FIXME: minus borders
-	}
+    switch -- [$w column cget $dragColumn -lock] {
+	left {set area left}
+	none {set area content}
+	right {set area right}
     }
+    scan [$w bbox $area] "%d %d %d %d" minX y1 maxX y2
     if {$x < $minX} {
 	set x $minX
     }
@@ -644,7 +634,7 @@ proc ::TreeCtrl::Motion1 {w x y} {
 	    }
 	}
 	dragColumn {
-	    scan [$w column bbox $Priv(column)] "%d %d %d %d" x1 y1 x2 y2
+	    scan [$w bbox header] "%d %d %d %d" x1 y1 x2 y2
 	    if {$y < $y1 - 30 || $y >= $y2 + 30} {
 		set inside 0
 	    } else {
-- 
cgit v0.12