Applied Paul Healy's 1997 patches for 8.0+ support.

diff --git a/ChangeLog b/ChangeLog
index ea20334dcdcd5d2fb5e6d3ec259bc0dd51488b05..76f88d3d77d90fc877cce9832f683a9483b90402 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Sun Dec 14 19:46:05 1997  Paul Healy <ei9gl@indigo.ie>
+       
+       * tkinspect: describe patch procedure to get around diff/patch/RCS
+       interaction. Released p3.
+       
+Sun Nov 23 22:14:36 1997  Paul Healy <ei9gl@indigo.ie>
+       
+       * tkinspect: handle procedures and variables inside namespaces
+       
+Sun Oct 05 20:09:10 1997  Paul Healy <ei9gl@indigo.ie>
+
+       * tkinspect: handle the disappearance of the tkerror proc in tk8.0
+       Released p2.
+
 Fri Jun 23 00:20:15 1995  Sam Shen  <sls@aconcagua.lbl.gov>
 
        * version.tcl: Bump to 5.1.6.

diff --git a/globals_list.tcl b/globals_list.tcl
index 93f38654475118cc9b5bee139f7fe27c1c3bf447..05aca205f5a320cf7ce2bd8227240a904965495b 100644 (file)
--- a/globals_list.tcl
+++ b/globals_list.tcl
@@ -121,7 +121,7 @@ widget globals_list {
     }
     method update {target} {
        $self clear
-       foreach var [lsort [send $target info globals]] {
+       foreach var [lsort [names::vars $target]] {
            $self append $var
        }
     }

diff --git a/install.tcl b/install.tcl
index ce4b75b8e77bbf375d6be9441c9519de6dc16e91..9bb0b2751c4947ddbd70f54c325a1b13d465750a 100644 (file)
--- a/install.tcl
+++ b/install.tcl
@@ -1,4 +1,6 @@
-#!/usr/local/bin/wish4.0
+#!/bin/sh
+# \
+exec wish "$0" "$*"
 #
 # $Id$
 #
@@ -78,7 +80,7 @@ pack .title .title2 -side top
 text .instructions -relief ridge -bd 4 -width 20 -height 4 -wrap word \
     -takefocus 0
 .instructions insert 1.0 \
-{Fill out the pathnames below and press the install button.  Any errors will appear in log window below.  If you wish to demo tkinspect w/o installing it, try "wish4.0 -f tkinspect.tcl".
+{Fill out the pathnames below and press the install button.  Any errors will appear in log window below.  If you wish to demo tkinspect w/o installing it, try "wish -f tkinspect.tcl".
 }
 pack .instructions -side top -fill both -expand 1
 set prefix /usr/local
@@ -110,7 +112,7 @@ proc log {msg} {
     update
 }
 
-foreach name {wish4.0 wish} {
+foreach name {wish8.4 wish8.3 wish8.0 wish4.0 wish} {
     log "Searching for $name..."
     foreach dir [split $env(PATH) :] {
        if [file executable $dir/$name] {
@@ -127,7 +129,7 @@ foreach name {wish4.0 wish} {
 if [info exists wish] {
     log "using $wish\n"    
 } else {
-    set wish /usr/local/bin/wish4.0
+    set wish /usr/local/bin/wish8.3
     log "Hmm, using $wish anways...\n"
 }
 
@@ -171,7 +173,7 @@ proc install {} {
        about.tcl defaults.tcl windows_info.tcl lists.tcl globals_list.tcl
        procs_list.tcl windows_list.tcl images_list.tcl menus_list.tcl
        canvas_list.tcl value.tcl stl.tcl sls.ppm version.tcl help.tcl
-       cmdline.tcl interface.tcl tclIndex
+       cmdline.tcl interface.tcl names.tcl tclIndex
        Intro.html Lists.html Procs.html Globals.html Windows.html
        Images.html Canvases.html Menus.html
        Value.html Miscellany.html Notes.html WhatsNew.html ChangeLog.html

diff --git a/names.tcl b/names.tcl
new file mode 100644 (file)
index 0000000..ee9271d
--- /dev/null
+++ b/names.tcl
@@ -0,0 +1,52 @@
+#
+# $Id$
+#
+
+namespace eval names {
+
+   namespace export names procs vars
+
+   proc unqualify s {
+      regsub -all "(^| ):+" $s {\1} result
+      return $result
+   }
+
+   proc names {target {name ::}} {
+      set result $name
+      foreach n [send $target namespace children $name] {
+         append result " " [names $target $n]
+      }
+      return $result
+   }
+
+   proc procs target {
+      set result {}
+      foreach n [names $target] {
+         foreach p [send $target namespace eval $n info procs] {
+            lappend result "$n\::$p"
+         }
+      }
+      return [unqualify $result]
+   }
+
+   proc vars target {
+      set result {}
+      foreach n [names $target] {
+         foreach v [send $target info vars ${n}::*] {
+            lappend result $v
+         }
+      }
+      return [unqualify $result]
+   }
+
+# dump [tk appname]
+
+   proc dump appname {
+      puts "names: [names $appname]"
+      puts ""
+      puts "procs: [procs $appname]"
+      puts ""
+      puts "vars: [vars $appname]"
+   }
+}
+

diff --git a/procs_list.tcl b/procs_list.tcl
index a2da5fadd02d032e9b2c3f55b1b597e87c2f0535..76bdf131cc2b8d8bd2119040aa62fa7e4d62cac1 100644 (file)
--- a/procs_list.tcl
+++ b/procs_list.tcl
@@ -8,7 +8,7 @@ widget procs_list {
     method get_item_name {} { return proc }
     method update {target} {
        $self clear
-       foreach proc [lsort [send $target info procs]] {
+       foreach proc [lsort [names::procs $target]] {
            $self append $proc
        }
     }

diff --git a/tkinspect.tcl b/tkinspect.tcl
index c702bb44bc2abe04426bf14407ff993d6c8b1241..dbccae982d0b0a515444e90fad160fb8d1e5e22b 100644 (file)
--- a/tkinspect.tcl
+++ b/tkinspect.tcl
@@ -41,7 +41,7 @@ proc tkinspect_widgets_init {} {
     foreach file {
        lists.tcl procs_list.tcl globals_list.tcl windows_list.tcl
        images_list.tcl about.tcl value.tcl help.tcl cmdline.tcl
-       windows_info.tcl menus_list.tcl canvas_list.tcl
+       windows_info.tcl menus_list.tcl canvas_list.tcl names.tcl
     } {
        uplevel #0 source $tkinspect_library/$file
     }
@@ -263,21 +263,14 @@ proc tkinspect_create_main_window {args} {
     return $w
 }
 
-auto_load tkerror
-rename tkerror tk_tkerror
+# 971005: phealy
+#
+# With tk8.0 the default tkerror proc is finally gone - bgerror
+# takes its place (see the changes tk8.0 changes file). This
+# simplified error handling should be ok. 
+#
 proc tkinspect_failure {reason} {
-    global tkinspect
-    set tkinspect(error_is_failure) 1
-    error $reason
-}
-proc tkerror {message} {
-    global tkinspect errorInfo
-    if [info exists tkinspect(error_is_failure)] {
-       unset tkinspect(error_is_failure)
-       tk_dialog .failure "Tkinspect Failure" $message warning 0 Ok
-    } else {
-       uplevel [list tk_tkerror $message]
-    }
+    tk_dialog .failure "Tkinspect Failure" $reason warning 0 Ok
 }
 
 tkinspect_widgets_init

diff --git a/version.tcl b/version.tcl
index 6ab1801fe98115b4630070a4841eec933f780281..42fcd45f4301ba7fb6d5b6e12e99e86771b5fcfa 100644 (file)
--- a/version.tcl
+++ b/version.tcl
@@ -6,12 +6,12 @@
 
 proc version_init {} {
     global tkinspect tk_version tk_patchLevel
-    set tkinspect(release) 5.1.6
-    set tkinspect(release_date) "June 23, 1995"
+    set tkinspect(release) 5.1.6p3
+    set tkinspect(release_date) "Nov 23, 1997"
     scan $tk_version "%d.%d" major minor
-    if {$major != 4} {
+    if {$major < 8} {
        puts stderr \
-      "tkinspect-5 requires Tk 4.x, you appear to be running Tk $major.$minor"
+      "tkinspect-5.1.6.p3 requires Tk 8.x, you appear to be running Tk $major.$minor"
        exit 1
     }
     if {[scan $tk_patchLevel "4.0b%d" beta] == 1 && $beta < 4} {