From 4ca29ea7b0eff09daa8f1192b5d1906220b5ca6a Mon Sep 17 00:00:00 2001 From: treectrl Date: Tue, 5 Sep 2006 21:56:15 +0000 Subject: Bumped copyright to 2006. --- generic/qebind.c | 4 ++-- generic/qebind.h | 4 ++-- generic/tkTreeColumn.c | 4 ++-- generic/tkTreeCtrl.c | 4 ++-- generic/tkTreeCtrl.h | 4 ++-- generic/tkTreeDisplay.c | 12 ++++++++++-- generic/tkTreeDrag.c | 4 ++-- generic/tkTreeElem.c | 4 ++-- generic/tkTreeElem.h | 4 ++-- generic/tkTreeItem.c | 4 ++-- generic/tkTreeMarquee.c | 4 ++-- generic/tkTreeNotify.c | 4 ++-- generic/tkTreeStyle.c | 4 ++-- generic/tkTreeTheme.c | 4 ++-- generic/tkTreeUtils.c | 4 ++-- 15 files changed, 38 insertions(+), 30 deletions(-) diff --git a/generic/qebind.c b/generic/qebind.c index 1e85f64..69d4a6b 100644 --- a/generic/qebind.c +++ b/generic/qebind.c @@ -3,9 +3,9 @@ * * This module implements quasi-events. * - * Copyright (c) 2002-2005 Tim Baker + * Copyright (c) 2002-2006 Tim Baker * - * RCS: @(#) $Id: qebind.c,v 1.14 2005/07/23 00:35:53 treectrl Exp $ + * RCS: @(#) $Id: qebind.c,v 1.15 2006/09/05 21:56:15 treectrl Exp $ */ /* diff --git a/generic/qebind.h b/generic/qebind.h index 1fcb2a4..a791a07 100644 --- a/generic/qebind.h +++ b/generic/qebind.h @@ -3,9 +3,9 @@ * * This module is the header for quasi-events. * - * Copyright (c) 2002-2005 Tim Baker + * Copyright (c) 2002-2006 Tim Baker * - * RCS: @(#) $Id: qebind.h,v 1.5 2005/07/10 22:12:32 treectrl Exp $ + * RCS: @(#) $Id: qebind.h,v 1.6 2006/09/05 21:56:15 treectrl Exp $ */ #ifndef INCLUDED_QEBIND_H diff --git a/generic/tkTreeColumn.c b/generic/tkTreeColumn.c index d3a53a4..ab780d4 100644 --- a/generic/tkTreeColumn.c +++ b/generic/tkTreeColumn.c @@ -3,11 +3,11 @@ * * This module implements treectrl widget's columns. * - * Copyright (c) 2002-2005 Tim Baker + * Copyright (c) 2002-2006 Tim Baker * Copyright (c) 2002-2003 Christian Krone * Copyright (c) 2003 ActiveState Corporation * - * RCS: @(#) $Id: tkTreeColumn.c,v 1.39 2006/07/11 00:09:52 treectrl Exp $ + * RCS: @(#) $Id: tkTreeColumn.c,v 1.40 2006/09/05 21:56:15 treectrl Exp $ */ #include "tkTreeCtrl.h" diff --git a/generic/tkTreeCtrl.c b/generic/tkTreeCtrl.c index 0cc5c31..a986c42 100644 --- a/generic/tkTreeCtrl.c +++ b/generic/tkTreeCtrl.c @@ -3,11 +3,11 @@ * * This module implements treectrl widgets for the Tk toolkit. * - * Copyright (c) 2002-2005 Tim Baker + * Copyright (c) 2002-2006 Tim Baker * Copyright (c) 2002-2003 Christian Krone * Copyright (c) 2003-2005 ActiveState, a division of Sophos * - * RCS: @(#) $Id: tkTreeCtrl.c,v 1.60 2006/08/04 22:49:37 hobbs2 Exp $ + * RCS: @(#) $Id: tkTreeCtrl.c,v 1.61 2006/09/05 21:56:15 treectrl Exp $ */ #include "tkTreeCtrl.h" diff --git a/generic/tkTreeCtrl.h b/generic/tkTreeCtrl.h index 3c2c579..195f34d 100644 --- a/generic/tkTreeCtrl.h +++ b/generic/tkTreeCtrl.h @@ -3,11 +3,11 @@ * * This module is the header for treectrl widgets for the Tk toolkit. * - * Copyright (c) 2002-2005 Tim Baker + * Copyright (c) 2002-2006 Tim Baker * Copyright (c) 2002-2003 Christian Krone * Copyright (c) 2003 ActiveState Corporation * - * RCS: @(#) $Id: tkTreeCtrl.h,v 1.43 2006/08/16 00:45:21 hobbs2 Exp $ + * RCS: @(#) $Id: tkTreeCtrl.h,v 1.44 2006/09/05 21:56:15 treectrl Exp $ */ #include "tkPort.h" diff --git a/generic/tkTreeDisplay.c b/generic/tkTreeDisplay.c index 4a3d6e9..49bd5c1 100644 --- a/generic/tkTreeDisplay.c +++ b/generic/tkTreeDisplay.c @@ -3,9 +3,9 @@ * * This module implements treectrl widget's main display code. * - * Copyright (c) 2002-2005 Tim Baker + * Copyright (c) 2002-2006 Tim Baker * - * RCS: @(#) $Id: tkTreeDisplay.c,v 1.36 2006/08/16 00:45:21 hobbs2 Exp $ + * RCS: @(#) $Id: tkTreeDisplay.c,v 1.37 2006/09/05 21:56:15 treectrl Exp $ */ #include "tkTreeCtrl.h" @@ -3695,7 +3695,15 @@ Tree_Display( /* Some change requires selection changes */ if (dInfo->flags & DINFO_REDO_SELECTION) { #ifdef SELECTION_VISIBLE + int abort = 0; + /* A event may occur so preserve things */ + Tcl_Preserve((ClientData) tree); Tree_DeselectHidden(tree); + if (tree->deleted) + abort = 1; + Tcl_Release((ClientData) tree); + if (abort) + return; #endif dInfo->flags &= ~(DINFO_REDO_SELECTION); } diff --git a/generic/tkTreeDrag.c b/generic/tkTreeDrag.c index edc45c3..0c96d06 100644 --- a/generic/tkTreeDrag.c +++ b/generic/tkTreeDrag.c @@ -3,9 +3,9 @@ * * This module implements outline dragging for treectrl widgets. * - * Copyright (c) 2002-2005 Tim Baker + * Copyright (c) 2002-2006 Tim Baker * - * RCS: @(#) $Id: tkTreeDrag.c,v 1.15 2005/09/16 23:43:18 treectrl Exp $ + * RCS: @(#) $Id: tkTreeDrag.c,v 1.16 2006/09/05 21:56:15 treectrl Exp $ */ #include "tkTreeCtrl.h" diff --git a/generic/tkTreeElem.c b/generic/tkTreeElem.c index c86c3e0..05c4483 100644 --- a/generic/tkTreeElem.c +++ b/generic/tkTreeElem.c @@ -3,9 +3,9 @@ * * This module implements elements for treectrl widgets. * - * Copyright (c) 2002-2005 Tim Baker + * Copyright (c) 2002-2006 Tim Baker * - * RCS: @(#) $Id: tkTreeElem.c,v 1.37 2005/07/16 18:02:53 treectrl Exp $ + * RCS: @(#) $Id: tkTreeElem.c,v 1.38 2006/09/05 21:56:15 treectrl Exp $ */ #include "tkTreeCtrl.h" diff --git a/generic/tkTreeElem.h b/generic/tkTreeElem.h index 84e03ce..b273df2 100644 --- a/generic/tkTreeElem.h +++ b/generic/tkTreeElem.h @@ -3,9 +3,9 @@ * * This module is the header for elements in treectrl widgets. * - * Copyright (c) 2002-2005 Tim Baker + * Copyright (c) 2002-2006 Tim Baker * - * RCS: @(#) $Id: tkTreeElem.h,v 1.17 2005/09/16 23:24:33 treectrl Exp $ + * RCS: @(#) $Id: tkTreeElem.h,v 1.18 2006/09/05 21:56:15 treectrl Exp $ */ typedef struct ElementType ElementType; diff --git a/generic/tkTreeItem.c b/generic/tkTreeItem.c index 87332bc..eada807 100644 --- a/generic/tkTreeItem.c +++ b/generic/tkTreeItem.c @@ -3,9 +3,9 @@ * * This module implements items for treectrl widgets. * - * Copyright (c) 2002-2005 Tim Baker + * Copyright (c) 2002-2006 Tim Baker * - * RCS: @(#) $Id: tkTreeItem.c,v 1.57 2006/08/16 00:45:21 hobbs2 Exp $ + * RCS: @(#) $Id: tkTreeItem.c,v 1.58 2006/09/05 21:56:15 treectrl Exp $ */ #include "tkTreeCtrl.h" diff --git a/generic/tkTreeMarquee.c b/generic/tkTreeMarquee.c index f9c62c4..e1d65cf 100644 --- a/generic/tkTreeMarquee.c +++ b/generic/tkTreeMarquee.c @@ -3,9 +3,9 @@ * * This module implements the selection rectangle for treectrl widgets. * - * Copyright (c) 2002-2005 Tim Baker + * Copyright (c) 2002-2006 Tim Baker * - * RCS: @(#) $Id: tkTreeMarquee.c,v 1.7 2005/09/17 00:05:37 treectrl Exp $ + * RCS: @(#) $Id: tkTreeMarquee.c,v 1.8 2006/09/05 21:56:16 treectrl Exp $ */ #include "tkTreeCtrl.h" diff --git a/generic/tkTreeNotify.c b/generic/tkTreeNotify.c index 3465e0d..a57cc7d 100644 --- a/generic/tkTreeNotify.c +++ b/generic/tkTreeNotify.c @@ -3,9 +3,9 @@ * * This module implements "qebind.c" events for treectrl widgets. * - * Copyright (c) 2002-2005 Tim Baker + * Copyright (c) 2002-2006 Tim Baker * - * RCS: @(#) $Id: tkTreeNotify.c,v 1.14 2005/09/16 01:29:46 treectrl Exp $ + * RCS: @(#) $Id: tkTreeNotify.c,v 1.15 2006/09/05 21:56:19 treectrl Exp $ */ #include "tkTreeCtrl.h" diff --git a/generic/tkTreeStyle.c b/generic/tkTreeStyle.c index f291322..3ab81b0 100644 --- a/generic/tkTreeStyle.c +++ b/generic/tkTreeStyle.c @@ -3,9 +3,9 @@ * * This module implements styles for treectrl widgets. * - * Copyright (c) 2002-2005 Tim Baker + * Copyright (c) 2002-2006 Tim Baker * - * RCS: @(#) $Id: tkTreeStyle.c,v 1.46 2006/07/11 00:10:31 treectrl Exp $ + * RCS: @(#) $Id: tkTreeStyle.c,v 1.47 2006/09/05 21:56:20 treectrl Exp $ */ #include "tkTreeCtrl.h" diff --git a/generic/tkTreeTheme.c b/generic/tkTreeTheme.c index 6c0b48e..38ba525 100644 --- a/generic/tkTreeTheme.c +++ b/generic/tkTreeTheme.c @@ -3,9 +3,9 @@ * * This module implements platform-specific visual themes. * - * Copyright (c) 2005 Tim Baker + * Copyright (c) 2006 Tim Baker * - * RCS: @(#) $Id: tkTreeTheme.c,v 1.11 2005/11/18 22:47:49 treectrl Exp $ + * RCS: @(#) $Id: tkTreeTheme.c,v 1.12 2006/09/05 21:56:20 treectrl Exp $ */ #ifdef WIN32 diff --git a/generic/tkTreeUtils.c b/generic/tkTreeUtils.c index 381ca7e..373c6cb 100644 --- a/generic/tkTreeUtils.c +++ b/generic/tkTreeUtils.c @@ -3,9 +3,9 @@ * * This module implements misc routines for treectrl widgets. * - * Copyright (c) 2002-2005 Tim Baker + * Copyright (c) 2002-2006 Tim Baker * - * RCS: @(#) $Id: tkTreeUtils.c,v 1.37 2005/09/19 20:38:43 treectrl Exp $ + * RCS: @(#) $Id: tkTreeUtils.c,v 1.38 2006/09/05 21:56:20 treectrl Exp $ */ #include "tkTreeCtrl.h" -- cgit v0.12