From 011e7719b1157aded7d5dc8d122ba375efb00901 Mon Sep 17 00:00:00 2001
From: treectrl <treectrl>
Date: Fri, 8 Dec 2006 20:46:26 +0000
Subject: Added -span debug option.

---
 demos/demo.tcl       | 8 +++++---
 generic/tkTreeCtrl.c | 6 ++++--
 generic/tkTreeCtrl.h | 3 ++-
 generic/tkTreeItem.c | 6 +++---
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/demos/demo.tcl b/demos/demo.tcl
index d20dae5..7c1dac5 100644
--- a/demos/demo.tcl
+++ b/demos/demo.tcl
@@ -1,6 +1,6 @@
 #!/bin/wish84.exe
 
-# RCS: @(#) $Id: demo.tcl,v 1.60 2006/12/07 03:52:02 treectrl Exp $
+# RCS: @(#) $Id: demo.tcl,v 1.61 2006/12/08 20:50:26 treectrl Exp $
 
 set VERSION 2.2
 
@@ -711,7 +711,7 @@ proc TreePlusScrollbarsInAFrame {f h v} {
     $f.t configure -xscrollincrement 20
 #    $f.t configure -itemprefix item# -columnprefix column#
     $f.t debug configure -enable no -display yes -erasecolor pink \
-	-drawcolor orange -displaydelay 30 -textlayout 0 -data 0
+	-drawcolor orange -displaydelay 30 -textlayout 0 -data 0 -span 0
     if {$h} {
 	$::scrollbarCmd $f.sh -orient horizontal -command "$f.t xview"
 	#		$f.t configure -xscrollcommand "$f.sh set"
@@ -914,6 +914,8 @@ proc MakeListPopup {T} {
 	-command {$Popup(T) debug configure -data $Popup(debug,data)}
     $m2 add checkbutton -label Display -variable Popup(debug,display) \
 	-command {$Popup(T) debug configure -display $Popup(debug,display)}
+    $m2 add checkbutton -label Span -variable Popup(debug,span) \
+	-command {$Popup(T) debug configure -span $Popup(debug,span)}
     $m2 add checkbutton -label "Text Layout" -variable Popup(debug,textlayout) \
 	-command {$Popup(T) debug configure -textlayout $Popup(debug,textlayout)}
     $m2 add separator
@@ -1106,7 +1108,7 @@ proc ShowPopup {T x y X Y} {
 	    $m add command -label "Item $item (recurse)" -command "$T item expand $item -recurse"
 	}
     }
-    foreach option {data display displaydelay enable textlayout} {
+    foreach option {data display displaydelay enable span textlayout} {
 	set Popup(debug,$option) [$T debug cget -$option]
     }
     set Popup(bgimg) [$T cget -backgroundimage]
diff --git a/generic/tkTreeCtrl.c b/generic/tkTreeCtrl.c
index bc6b540..ac5d5b3 100644
--- a/generic/tkTreeCtrl.c
+++ b/generic/tkTreeCtrl.c
@@ -7,7 +7,7 @@
  * Copyright (c) 2002-2003 Christian Krone
  * Copyright (c) 2003-2005 ActiveState, a division of Sophos
  *
- * RCS: @(#) $Id: tkTreeCtrl.c,v 1.95 2006/12/06 00:52:03 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeCtrl.c,v 1.96 2006/12/08 20:46:26 treectrl Exp $
  */
 
 #include "tkTreeCtrl.h"
@@ -290,6 +290,9 @@ static Tk_OptionSpec debugSpecs[] = {
     {TK_OPTION_COLOR, "-erasecolor", (char *) NULL, (char *) NULL,
      (char *) NULL, -1, Tk_Offset(TreeCtrl, debug.eraseColor),
      TK_OPTION_NULL_OK, (ClientData) NULL, 0},
+    {TK_OPTION_BOOLEAN, "-span", (char *) NULL, (char *) NULL,
+     "1", -1, Tk_Offset(TreeCtrl, debug.span),
+     0, (ClientData) NULL, 0},
     {TK_OPTION_BOOLEAN, "-textlayout", (char *) NULL, (char *) NULL,
      "1", -1, Tk_Offset(TreeCtrl, debug.textLayout),
      0, (ClientData) NULL, 0},
@@ -1782,7 +1785,6 @@ TreeDestroy(
 
     Tree_FreeColumns(tree);
 
-dbwin("tree->regionStackLen = %d", tree->regionStackLen);
     while (tree->regionStackLen > 0)
 	TkDestroyRegion(tree->regionStack[--tree->regionStackLen]);
 
diff --git a/generic/tkTreeCtrl.h b/generic/tkTreeCtrl.h
index 79e52bc..e3cd0c0 100644
--- a/generic/tkTreeCtrl.h
+++ b/generic/tkTreeCtrl.h
@@ -7,7 +7,7 @@
  * Copyright (c) 2002-2003 Christian Krone
  * Copyright (c) 2003 ActiveState Corporation
  *
- * RCS: @(#) $Id: tkTreeCtrl.h,v 1.83 2006/12/06 00:52:04 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeCtrl.h,v 1.84 2006/12/08 20:46:44 treectrl Exp $
  */
 
 #include "tkPort.h"
@@ -123,6 +123,7 @@ struct TreeCtrlDebug
     int enable;			/* Turn all debugging on/off */
     int data;			/* Debug data structures */
     int display;		/* Debug display routines */
+    int span;			/* Debug column spanning */
     int textLayout;		/* Debug text layout */
     int displayDelay;		/* Delay between copy/draw operations */
     XColor *eraseColor;		/* Erase "invalidated" areas */
diff --git a/generic/tkTreeItem.c b/generic/tkTreeItem.c
index 642b623..13cacc9 100644
--- a/generic/tkTreeItem.c
+++ b/generic/tkTreeItem.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2002-2006 Tim Baker
  *
- * RCS: @(#) $Id: tkTreeItem.c,v 1.97 2006/12/06 03:58:55 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeItem.c,v 1.98 2006/12/08 20:48:48 treectrl Exp $
  */
 
 #include "tkTreeCtrl.h"
@@ -3695,7 +3695,7 @@ TreeItem_SpansInvalidate(
 	count++;
     }
 
-    if (count && tree->debug.enable && tree->debug.display)
+    if (count && tree->debug.enable && tree->debug.span)
 	dbwin("TreeItem_SpansInvalidate forgot %d items\n", count);
 }
 
@@ -3730,7 +3730,7 @@ TreeItem_SpansRedo(
     int columnIndex = 0, spanner = 0, span = 1, simple = TRUE;
     int lock = TreeColumn_Lock(treeColumn);
 
-    if (tree->debug.enable && tree->debug.display)
+    if (tree->debug.enable && tree->debug.span)
 	dbwin("TreeItem_SpansRedo item %d\n", item->id);
 
     if (item->spans == NULL) {
-- 
cgit v0.12