diff options
author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-16 07:13:14 +0000 |
---|---|---|
committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-16 07:13:14 +0000 |
commit | 9e51ec666b367a8bca102d8f858173cc7ed56e12 (patch) | |
tree | 5597a08bc2b54a058625fb6e088cb34a15d3bfa3 /ext/tk/lib/tkextlib/bwidget | |
parent | c89c302d3ff426d3f8a21da16cc8c2c8e42613a2 (diff) | |
download | ruby-9e51ec666b367a8bca102d8f858173cc7ed56e12.tar.gz |
* 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/trunk@7574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/lib/tkextlib/bwidget')
-rw-r--r-- | ext/tk/lib/tkextlib/bwidget/labelentry.rb | 6 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/bwidget/listbox.rb | 12 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/bwidget/notebook.rb | 6 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/bwidget/spinbox.rb | 6 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/bwidget/tree.rb | 12 |
5 files changed, 28 insertions, 14 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 |