* 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

11 files changed, 49 insertions, 25 deletions

diff --git a/ext/tk/lib/tkextlib/bwidget/labelentry.rb b/ext/tk/lib/tkextlib/bwidget/labelentry.rb
index 1425ef7730..19e92d7ae4 100644
--- a/ext/tk/lib/tkextlib/bwidget/labelentry.rb
+++ b/ext/tk/lib/tkextlib/bwidget/labelentry.rb
@@ -28,7 +28,8 @@ class Tk::BWidget::LabelEntry
   #  self
   #end
   def entrybind(context, *args)
-    if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0])
       cmd = args.shift
     else
       cmd = Proc.new
@@ -42,7 +43,8 @@ class Tk::BWidget::LabelEntry
   #  self
   #end
   def entrybind_append(context, *args)
-    if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0])
       cmd = args.shift
     else
       cmd = Proc.new
diff --git a/ext/tk/lib/tkextlib/bwidget/listbox.rb b/ext/tk/lib/tkextlib/bwidget/listbox.rb
index 7f218c923c..178866f699 100644
--- a/ext/tk/lib/tkextlib/bwidget/listbox.rb
+++ b/ext/tk/lib/tkextlib/bwidget/listbox.rb
@@ -49,7 +49,8 @@ class Tk::BWidget::ListBox
   #  self
   #end
   def imagebind(context, *args)
-    if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0])
       cmd = args.shift
     else
       cmd = Proc.new
@@ -64,7 +65,8 @@ class Tk::BWidget::ListBox
   #  self
   #end
   def imagebind_append(context, *args)
-    if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0])
       cmd = args.shift
     else
       cmd = Proc.new
@@ -88,7 +90,8 @@ class Tk::BWidget::ListBox
   #  self
   #end
   def textbind(context, *args)
-    if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0])
       cmd = args.shift
     else
       cmd = Proc.new
@@ -103,7 +106,8 @@ class Tk::BWidget::ListBox
   #  self
   #end
   def textbind_append(context, *args)
-    if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0])
       cmd = args.shift
     else
       cmd = Proc.new
diff --git a/ext/tk/lib/tkextlib/bwidget/notebook.rb b/ext/tk/lib/tkextlib/bwidget/notebook.rb
index 8888ab224b..01299d2de8 100644
--- a/ext/tk/lib/tkextlib/bwidget/notebook.rb
+++ b/ext/tk/lib/tkextlib/bwidget/notebook.rb
@@ -46,7 +46,8 @@ class Tk::BWidget::NoteBook
   #  self
   #end
   def tabbind(context, *args)
-    if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0])
       cmd = args.shift
     else
       cmd = Proc.new
@@ -61,7 +62,8 @@ class Tk::BWidget::NoteBook
   #  self
   #end
   def tabbind_append(context, *args)
-    if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0])
       cmd = args.shift
     else
       cmd = Proc.new
diff --git a/ext/tk/lib/tkextlib/bwidget/spinbox.rb b/ext/tk/lib/tkextlib/bwidget/spinbox.rb
index 66501ed702..52dfa30abc 100644
--- a/ext/tk/lib/tkextlib/bwidget/spinbox.rb
+++ b/ext/tk/lib/tkextlib/bwidget/spinbox.rb
@@ -27,7 +27,8 @@ class Tk::BWidget::SpinBox
   #  self
   #end
   def entrybind(context, *args)
-    if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0])
       cmd = args.shift
     else
       cmd = Proc.new
@@ -41,7 +42,8 @@ class Tk::BWidget::SpinBox
   #  self
   #end
   def entrybind_append(context, *args)
-    if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0])
       cmd = args.shift
     else
       cmd = Proc.new
diff --git a/ext/tk/lib/tkextlib/bwidget/tree.rb b/ext/tk/lib/tkextlib/bwidget/tree.rb
index 16ca8e8927..dadf3d5161 100644
--- a/ext/tk/lib/tkextlib/bwidget/tree.rb
+++ b/ext/tk/lib/tkextlib/bwidget/tree.rb
@@ -46,7 +46,8 @@ class Tk::BWidget::Tree
   #  self
   #end
   def imagebind(context, *args)
-    if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0])
       cmd = args.shift
     else
       cmd = Proc.new
@@ -61,7 +62,8 @@ class Tk::BWidget::Tree
   #  self
   #end
   def imagebind_append(context, *args)
-    if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0])
       cmd = args.shift
     else
       cmd = Proc.new
@@ -85,7 +87,8 @@ class Tk::BWidget::Tree
   #  self
   #end
   def textbind(context, *args)
-    if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0])
       cmd = args.shift
     else
       cmd = Proc.new
@@ -100,7 +103,8 @@ class Tk::BWidget::Tree
   #  self
   #end
   def textbind_append(context, *args)
-    if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0])
       cmd = args.shift
     else
       cmd = Proc.new
diff --git a/ext/tk/lib/tkextlib/itk/incr_tk.rb b/ext/tk/lib/tkextlib/itk/incr_tk.rb
index 106ffa3519..1d80e1cd6b 100644
--- a/ext/tk/lib/tkextlib/itk/incr_tk.rb
+++ b/ext/tk/lib/tkextlib/itk/incr_tk.rb
@@ -350,7 +350,8 @@ module Tk
             fail RuntimeError, 'component is not assigned to a widget'
           end
         end
-        if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        if TkComm._callback_entry?(args[0])
           cmd = args.shift
         else
           cmd = Proc.new
@@ -378,7 +379,8 @@ module Tk
             fail RuntimeError, 'component is not assigned to a widget'
           end
         end
-        if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        if TkComm._callback_entry?(args[0])
           cmd = args.shift
         else
           cmd = Proc.new
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb
index ba563ba589..939d97de67 100644
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb
@@ -102,7 +102,8 @@ class Tk::Iwidgets::Scrolledcanvas
   #  self
   #end
   def itembind(tag, context, *args)
-    if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0])
       cmd = args.shift
     else
       cmd = Proc.new
@@ -116,7 +117,8 @@ class Tk::Iwidgets::Scrolledcanvas
   #  self
   #end
   def itembind_append(tag, context, *args)
-    if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0])
       cmd = args.shift
     else
       cmd = Proc.new
diff --git a/ext/tk/lib/tkextlib/tile/style.rb b/ext/tk/lib/tkextlib/tile/style.rb
index 3be8c1d580..c8c0a802df 100644
--- a/ext/tk/lib/tkextlib/tile/style.rb
+++ b/ext/tk/lib/tkextlib/tile/style.rb
@@ -67,6 +67,6 @@ class << Tk::Tile::Style
   end
 
   def theme_use(name)
-    tk_call('style', 'use', name)
+    tk_call('style', 'theme', 'use', name)
   end
 end
diff --git a/ext/tk/lib/tkextlib/tkDND/tkdnd.rb b/ext/tk/lib/tkextlib/tkDND/tkdnd.rb
index d40d60217a..375ac89518 100644
--- a/ext/tk/lib/tkextlib/tkDND/tkdnd.rb
+++ b/ext/tk/lib/tkextlib/tkDND/tkdnd.rb
@@ -88,7 +88,8 @@ module Tk
       #  self
       #end
       def dnd_bindtarget(type, event, *args)
-        if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        if TkComm._callback_entry?(args[0])
           cmd = args.shift
         else
           cmd = Proc.new
@@ -127,7 +128,8 @@ module Tk
       #  self
       #end
       def dnd_bindsource(type, *args)
-        if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        if TkComm._callback_entry?(args[0])
           cmd = args.shift
         else
           cmd = Proc.new
diff --git a/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb b/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
index 11f723a8ff..9c1e977d14 100644
--- a/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
+++ b/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
@@ -748,7 +748,8 @@ class Tk::TreeCtrl
   #  self
   #end
   def notify_bind(obj, event, *args)
-    if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0])
       cmd = args.shift
     else
       cmd = Proc.new
@@ -762,7 +763,8 @@ class Tk::TreeCtrl
   #  self
   #end
   def notify_bind_append(obj, event, *args)
-    if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0])
       cmd = args.shift
     else
       cmd = Proc.new
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
     }