* ext/tk/lib/tk/bindtag.rb: bug fix [ruby-talk: 123667]

* ext/tk/lib/tk/timer.rb: accept :idle for the interval argument
* ext/tk/lib/tk.rb: add TkComm._callback_entry?()
* ext/tk/lib/multi-tk.rb: add MultiTkIp.cb_entry_class
* ext/tk/lib/tk/canvas.rb: use TkComm._callback_entry?()
* ext/tk/lib/tk/canvastag.rb: ditto
* ext/tk/lib/tk/dialog.rb: ditto
* ext/tk/lib/tk/optiondb.rb: ditto
* ext/tk/lib/tk/text.rb: ditto
* ext/tk/lib/tk/texttag.rb: ditto
* ext/tk/lib/tk/textwindow.rb: ditto
* ext/tk/lib/tk/timer.rb: ditto
* ext/tk/lib/tk/validation.rb: ditto
* ext/tk/lib/tkextlib/*: ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 2 deletions

diff --git a/ext/tk/lib/tkextlib/winico/winico.rb b/ext/tk/lib/tkextlib/winico/winico.rb
index 8a71cbb401..1e2f1c0062 100644
--- a/ext/tk/lib/tkextlib/winico/winico.rb
+++ b/ext/tk/lib/tkextlib/winico/winico.rb
@@ -149,7 +149,8 @@ class Tk::Winico
       if keys[k].kind_of?(Array)
         cmd, *args = keys[k]
         keys[k] = Winico_callback.new(cmd, args.join(' '))
-      elsif keys[k].kind_of?(Proc)
+       # elsif keys[k].kind_of?(Proc)
+      elsif TkComm._callback_entry?(keys[k])
         keys[k] = Winico_callback.new(keys[k])
       end
     }
@@ -164,7 +165,8 @@ class Tk::Winico
       if keys[k].kind_of?(Array)
         cmd, *args = keys[k]
         keys[k] = Winico_callback.new(cmd, args.join(' '))
-      elsif keys[k].kind_of?(Proc)
+      # elsif keys[k].kind_of?(Proc)
+      elsif TkComm._callback_entry?(keys[k])
         keys[k] = Winico_callback.new(keys[k])
       end
     }