From a7574f31daa7c40a6e1651a7a1fb5b5cd8cecfda Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 30 Jul 2003 04:36:29 +0000
Subject: * additional check of Tk interpreters' status for a little more
 safety

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4226 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/tk.rb      | 31 ++++++++++++++++++++++++-------
 ext/tk/lib/tkafter.rb |  3 ++-
 2 files changed, 26 insertions(+), 8 deletions(-)

(limited to 'ext/tk/lib')

diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 6ee5c36fb..13e41ece4 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -3359,7 +3359,7 @@ class TkObject<TkKernel
   private :tk_trace_variable
 
   def destroy
-    tk_call 'trace', 'vdelete', @tk_vn, 'w', @var_id if defined? @var_id
+    # tk_call 'trace', 'vdelete', @tk_vn, 'w', @var_id if @var_id
   end
 end
 
@@ -3721,10 +3721,21 @@ class TkWindow<TkObject
     self
   end
 
+  def _destroy_children
+    children = []
+    rexp = /^#{self.path}\.[^.]+$/
+    TkCore::INTERP.tk_windows.each{|path, obj|
+      children << obj if path =~ rexp
+    }
+    children.each{|obj| obj.destroy}
+  end
+  private :_destroy_children
+
   def destroy
     super
+    _destroy_children
     tk_call 'destroy', epath
-    if @cmdtbl
+    if defined?(@cmdtbl)
       for id in @cmdtbl
 	uninstall_cmd id
       end
@@ -4959,6 +4970,10 @@ module TkComposite
       @path = @epath = @frame.path
       initialize_composite(*args)
     end
+    unless defined? @delegates
+      @delegates = {} 
+      @delegates['DEFAULT'] = @frame
+    end
   end
 
   def epath
@@ -4969,10 +4984,6 @@ module TkComposite
   private :initialize_composite
 
   def delegate(option, *wins)
-    unless @delegates
-      @delegates = {} 
-      @delegates['DEFAULT'] = @frame
-    end
     if @delegates[option].kind_of?(Array)
       for i in wins
 	@delegates[option].push(i)
@@ -5077,7 +5088,13 @@ end
 # widget_destroy_hook
 require 'tkvirtevent'
 TkBindTag::ALL.bind(TkVirtualEvent.new('Destroy'), proc{|widget| 
-		      if widget.respond_to? :__destroy_hook__
+		      if widget.respond_to?(:path)
+			w = widget.path
+		      else
+			w = widget.to_s
+		      end
+		      if widget.respond_to?(:__destroy_hook__) &&
+			  TkCore::INTERP._invoke('winfo','exist',w) == '1'
 			begin
 			  widget.__destroy_hook__
 			rescue Exception
diff --git a/ext/tk/lib/tkafter.rb b/ext/tk/lib/tkafter.rb
index b24d6c72d..eddfc16f6 100644
--- a/ext/tk/lib/tkafter.rb
+++ b/ext/tk/lib/tkafter.rb
@@ -34,7 +34,7 @@ class TkTimer
     begin
       ex_obj.cb_call
     rescue Exception
-      Tk_CBTBL[obj_id] = nil
+      ex_obj.cancel
       ""
     end
   end
@@ -143,6 +143,7 @@ class TkTimer
     set_procs(*args) if args != []
 
     @running = false
+    @in_callback = false
   end
 
   attr :after_id
-- 
cgit