2000-03-30 Fernando Nasser <fnasser@totem.to.cygnus.com>

	* variables.tcl (edit): Remove call to close, which caused editing
	of variables to fail.
	Note: I don't know why we would need to do this here as it seems
	that the "delete entry" operation will do that.
	Perhaps this was to account to some old widget bug.
	But we cannot call close here because it calls UnEdit,
	which unsets some of the edit state.
        (open): Make sure to abort any ongoing edit.  This was causing problems
	when someone tried to expand an structure while editing its pointer.

diff --git a/gdb/gdbtk/library/ChangeLog b/gdb/gdbtk/library/ChangeLog
index f711080..1b5abca 100644 (file)
--- a/gdb/gdbtk/library/ChangeLog
+++ b/gdb/gdbtk/library/ChangeLog
@@ -1,3 +1,15 @@
+2000-03-30  Fernando Nasser  <fnasser@totem.to.cygnus.com>
+
+       * variables.tcl (edit): Remove call to close, which caused editing
+       of variables to fail.
+       Note: I don't know why we would need to do this here as it seems
+       that the "delete entry" operation will do that.
+       Perhaps this was to account to some old widget bug.
+       But we cannot call close here because it calls UnEdit,
+       which unsets some of the edit state.
+        (open): Make sure to abort any ongoing edit.  This was causing problems
+       when someone tried to expand an structure while editing its pointer.
+
 2000-03-28  James Ingham  <jingham@leda.cygnus.com>
 
        * managedwin.itb (ManagedWin::startup): Open the SrcWin, this does 

diff --git a/gdb/gdbtk/library/variables.tcl b/gdb/gdbtk/library/variables.tcl
index a1f15e2..eb4edc7 100644 (file)
--- a/gdb/gdbtk/library/variables.tcl
+++ b/gdb/gdbtk/library/variables.tcl
@@ -425,7 +425,6 @@ class VariableWin {
        # Find out what the previous entry is
        set previous [getPrevious $variable]
 
-       close $variable
        $Hlist delete entry $variable
 
        set cmd [format { \
@@ -644,6 +643,11 @@ class VariableWin {
        # We must lookup all the variables for this struct
        #    debug "VariableWin::open $path"
 
+       # Cancel any edits
+       if {[info exists EditEntry]} {
+           UnEdit
+       }
+
        if {!$Running} {
            # Do not open disabled paths
            if {$Update($this,$path)} {