From 10484e5c95d649554fc353012626c3696edd2eac 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@7821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/tk/bindtag.rb   | 1 +
 ext/tk/lib/tk/canvas.rb    | 4 ++--
 ext/tk/lib/tk/canvastag.rb | 4 ++--
 ext/tk/lib/tk/menu.rb      | 2 ++
 ext/tk/lib/tk/text.rb      | 4 ++--
 ext/tk/lib/tk/texttag.rb   | 4 ++--
 6 files changed, 11 insertions(+), 8 deletions(-)

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

diff --git a/ext/tk/lib/tk/bindtag.rb b/ext/tk/lib/tk/bindtag.rb
index 737223e3df..9023a08e06 100644
--- a/ext/tk/lib/tk/bindtag.rb
+++ b/ext/tk/lib/tk/bindtag.rb
@@ -23,6 +23,7 @@ class TkBindTag
       @id = name
       BTagID_TBL[@id] = self
       bind(*args, &b) if args != []
+      self
     }
   end
 
diff --git a/ext/tk/lib/tk/canvas.rb b/ext/tk/lib/tk/canvas.rb
index a0543cc42d..e9a2caccd6 100644
--- a/ext/tk/lib/tk/canvas.rb
+++ b/ext/tk/lib/tk/canvas.rb
@@ -100,7 +100,7 @@ class TkCanvas<TkWindow
   #end
   def itembind(tag, 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
@@ -115,7 +115,7 @@ class TkCanvas<TkWindow
   #end
   def itembind_append(tag, 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
diff --git a/ext/tk/lib/tk/canvastag.rb b/ext/tk/lib/tk/canvastag.rb
index 2eec6e3ca1..b1ac10ba43 100644
--- a/ext/tk/lib/tk/canvastag.rb
+++ b/ext/tk/lib/tk/canvastag.rb
@@ -27,7 +27,7 @@ module TkcTagAccess
   #end
   def bind(seq, *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
@@ -42,7 +42,7 @@ module TkcTagAccess
   #end
   def bind_append(seq, *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
diff --git a/ext/tk/lib/tk/menu.rb b/ext/tk/lib/tk/menu.rb
index 8a33b482c7..e646d56246 100644
--- a/ext/tk/lib/tk/menu.rb
+++ b/ext/tk/lib/tk/menu.rb
@@ -438,6 +438,7 @@ class TkOptionMenubutton<TkMenubutton
 
     parent = nil
     if args[0].kind_of?(TkWindow) || args[0] == nil
+      keys.delete('parent') # ignore
       parent = args.shift 
     else
       parent = keys.delete('parent')
@@ -445,6 +446,7 @@ class TkOptionMenubutton<TkMenubutton
 
     @variable = nil
     if args[0].kind_of?(TkVariable) || args[0] == nil
+      keys.delete('variable') # ignore
       @variable = args.shift 
     else
       @variable = keys.delete('variable')
diff --git a/ext/tk/lib/tk/text.rb b/ext/tk/lib/tk/text.rb
index 8069adc57a..355153ea07 100644
--- a/ext/tk/lib/tk/text.rb
+++ b/ext/tk/lib/tk/text.rb
@@ -589,7 +589,7 @@ class TkText<TkTextWin
   #end
   def tag_bind(tag, seq, *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
@@ -604,7 +604,7 @@ class TkText<TkTextWin
   #end
   def tag_bind_append(tag, seq, *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
diff --git a/ext/tk/lib/tk/texttag.rb b/ext/tk/lib/tk/texttag.rb
index 1e3a2d7e41..6201c7caa8 100644
--- a/ext/tk/lib/tk/texttag.rb
+++ b/ext/tk/lib/tk/texttag.rb
@@ -173,7 +173,7 @@ class TkTextTag<TkObject
   #end
   def bind(seq, *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
@@ -188,7 +188,7 @@ class TkTextTag<TkObject
   #end
   def bind_append(seq, *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
-- 
cgit v1.2.3