From 05e0b34d1bb3f1651679f1ff76cf154156ac936c Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Tue, 26 Feb 2002 01:58:25 +0000
Subject: 	* generic/tkText.c (ConfigureText): reenable the blinking
 cursor 	on state change where necessary. [Bug #503772]

---
 ChangeLog        | 14 ++++++++++++++
 generic/tkText.c | 12 +++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ecb067f..8d43a76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2002-02-25  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* generic/tkText.c (ConfigureText): reenable the blinking cursor
+	on state change where necessary. [Bug #503772]
+
+	* tests/listbox.test:
+	* generic/tkListbox.c: corrected error handling when setting to an
+	invalid listvar value. [Bug #503613]
+
+	* library/scale.tcl: mirror B2 bindings to B3 on Windows to better
+	accomodate two button mice. [Patch #493145]
+
+	* library/panedwindow.tcl: improved proxy sash handling. (boudaillier)
+
 2002-02-25  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
 
 	* tests/filebox.test: Reorganised and fixed so that tests are
diff --git a/generic/tkText.c b/generic/tkText.c
index f749deb..2b9c60e 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -14,7 +14,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkText.c,v 1.25 2002/01/25 21:09:37 dgp Exp $
+ * RCS: @(#) $Id: tkText.c,v 1.26 2002/02/26 01:58:25 hobbs Exp $
  */
 
 #include "default.h"
@@ -972,6 +972,16 @@ ConfigureText(interp, textPtr, argc, argv, flags)
     }
 
     /*
+     * Account for state changes that would reenable blinking cursor state.
+     */
+
+    if (textPtr->flags & GOT_FOCUS) {
+	Tcl_DeleteTimerHandler(textPtr->insertBlinkHandler);
+	textPtr->insertBlinkHandler = (Tcl_TimerToken) NULL;
+	TextBlinkProc((ClientData) textPtr);
+    }
+
+    /*
      * Register the desired geometry for the window, and arrange for
      * the window to be redisplayed.
      */
-- 
cgit v0.12