From 3dbbe5a7857da3ebde58fa993d9e56ee04dc51a6 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 25 Jan 2005 05:09:22 +0000
Subject: * ext/tcltklib/tcltklib.c: fix SEGV bug; trouble on canceling
 remained   after scripts [ruby-dev:25479]: NULL current namespce when
 deleting   Tk interpreter [ruby-talk:126225] * ext/tcltklib/extconf.rb: bug
 fix; TCL_ENABLE_THREAD flag is inverted   [ruby-talk:126360] *
 ext/tcltklib/extconf.rb: add yet another native-thread check *
 ext/tk/tkutil.c: fix SEGV bug; NULL string pointer when finalize   Ruby
 interpreter * ext/tk/lib/multi-tk.rb: avoid warning for deleted safeTk ip
 frame * ext/tk/lib/tk/bindtag.rb: bug fix; new method of named bindtag  
 doesn't return the created object [ruby-dev:25479] * ext/tk/lib/tk/menu.rb:
 bug on treating arguments [ruby-dev:25479] * ext/tk/lib/tk.rb: bug fix;
 cannot accept a callback ID string for   a command argument [ruby-dev:25479]
 * ext/tk/lib/multi-tk.rb: ditto * ext/tk/lib/tk/*.rb: ditto *
 ext/tk/lib/tkextlib/*.rb: ditto * ext/tk/sample/demos-jp/anilabel.rb: new
 demo script * ext/tk/sample/demos-en/anilabel.rb: ditto *
 ext/tk/sample/tkHTML/ss.rb: local variable scope bug fix   [ruby-dev:25479]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/tk.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'ext/tk/lib/tk.rb')

diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 9dae5f089..7f734a082 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -913,7 +913,7 @@ module TkComm
   #end
   def bind(tagOrClass, context, *args)
     # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0])
+    if TkComm._callback_entry?(args[0]) || !block_given?
       cmd = args.shift
     else
       cmd = Proc.new
@@ -928,7 +928,7 @@ module TkComm
   #end
   def bind_append(tagOrClass, context, *args)
     # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0])
+    if TkComm._callback_entry?(args[0]) || !block_given?
       cmd = args.shift
     else
       cmd = Proc.new
@@ -952,7 +952,7 @@ module TkComm
   #end
   def bind_all(context, *args)
     # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0])
+    if TkComm._callback_entry?(args[0]) || !block_given?
       cmd = args.shift
     else
       cmd = Proc.new
@@ -967,7 +967,7 @@ module TkComm
   #end
   def bind_append_all(context, *args)
     # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0])
+    if TkComm._callback_entry?(args[0]) || !block_given?
       cmd = args.shift
     else
       cmd = Proc.new
@@ -2131,7 +2131,7 @@ module TkBindCore
   #end
   def bind(context, *args)
     # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0])
+    if TkComm._callback_entry?(args[0]) || !block_given?
       cmd = args.shift
     else
       cmd = Proc.new
@@ -2144,7 +2144,7 @@ module TkBindCore
   #end
   def bind_append(context, *args)
     # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0])
+    if TkComm._callback_entry?(args[0]) || !block_given?
       cmd = args.shift
     else
       cmd = Proc.new
@@ -3940,7 +3940,7 @@ end
 #Tk.freeze
 
 module Tk
-  RELEASE_DATE = '2004-12-27'.freeze
+  RELEASE_DATE = '2005-01-25'.freeze
 
   autoload :AUTO_PATH,        'tk/variable'
   autoload :TCL_PACKAGE_PATH, 'tk/variable'
-- 
cgit