diff options
author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-07 14:53:02 +0000 |
---|---|---|
committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-07 14:53:02 +0000 |
commit | c2ac862f1a3a1d387f65d4cd6342b4a836b03893 (patch) | |
tree | 37ee1f403ca1e6699763b08d30545e690e7fd498 /ext/tk/lib/tk.rb | |
parent | 4cbaddcf8c61f411d54c2e7799e234972dd382ed (diff) | |
download | ruby-c2ac862f1a3a1d387f65d4cd6342b4a836b03893.tar.gz |
* ext/tk/lib/tk.rb: bind-event methods accept multi substitution arguments.
* ext/tk/lib/tk/canvas.rb: ditto.
* ext/tk/lib/tk/canvastag.rb: ditto.
* ext/tk/lib/tk/text.rb: ditto.
* ext/tk/lib/tk/texttag.rb: ditto.
* ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto.
* ext/tk/lib/tkextlib/tktable/tktable.rb: ditto.
* ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/lib/tk.rb')
-rw-r--r-- | ext/tk/lib/tk.rb | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index 807ccd2285..ea9f0749f5 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -818,8 +818,8 @@ module TkComm end end - def _bind_core(mode, what, context, cmd, args=nil) - id = install_bind(cmd, args) if cmd + def _bind_core(mode, what, context, cmd, *args) + id = install_bind(cmd, *args) if cmd begin tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>", mode + id])) @@ -829,12 +829,12 @@ module TkComm end end - def _bind(what, context, cmd, args=nil) - _bind_core('', what, context, cmd, args) + def _bind(what, context, cmd, *args) + _bind_core('', what, context, cmd, *args) end - def _bind_append(what, context, cmd, args=nil) - _bind_core('+', what, context, cmd, args) + def _bind_append(what, context, cmd, *args) + _bind_core('+', what, context, cmd, *args) end def _bind_remove(what, context) @@ -868,8 +868,8 @@ module TkComm end end - def _bind_core_for_event_class(klass, mode, what, context, cmd, args=nil) - id = install_bind_for_event_class(klass, cmd, args) if cmd + def _bind_core_for_event_class(klass, mode, what, context, cmd, *args) + id = install_bind_for_event_class(klass, cmd, *args) if cmd begin tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>", mode + id])) @@ -879,12 +879,12 @@ module TkComm end end - def _bind_for_event_class(klass, what, context, cmd, args=nil) - _bind_core_for_event_class(klass, '', what, context, cmd, args) + def _bind_for_event_class(klass, what, context, cmd, *args) + _bind_core_for_event_class(klass, '', what, context, cmd, *args) end - def _bind_append_for_event_class(klass, what, context, cmd, args=nil) - _bind_core_for_event_class(klass, '+', what, context, cmd, args) + def _bind_append_for_event_class(klass, what, context, cmd, *args) + _bind_core_for_event_class(klass, '+', what, context, cmd, *args) end def _bind_remove_for_event_class(klass, what, context) @@ -901,13 +901,13 @@ module TkComm :_bind_append_for_event_class, :_bind_remove_for_event_class, :_bindinfo_for_event_class - def bind(tagOrClass, context, cmd=Proc.new, args=nil) - _bind(["bind", tagOrClass], context, cmd, args) + def bind(tagOrClass, context, cmd=Proc.new, *args) + _bind(["bind", tagOrClass], context, cmd, *args) tagOrClass end - def bind_append(tagOrClass, context, cmd=Proc.new, args=nil) - _bind_append(["bind", tagOrClass], context, cmd, args) + def bind_append(tagOrClass, context, cmd=Proc.new, *args) + _bind_append(["bind", tagOrClass], context, cmd, *args) tagOrClass end @@ -920,13 +920,13 @@ module TkComm _bindinfo(['bind', tagOrClass], context) end - def bind_all(context, cmd=Proc.new, args=nil) - _bind(['bind', 'all'], context, cmd, args) + def bind_all(context, cmd=Proc.new, *args) + _bind(['bind', 'all'], context, cmd, *args) TkBindTag::ALL end - def bind_append_all(context, cmd=Proc.new, args=nil) - _bind_append(['bind', 'all'], context, cmd, args) + def bind_append_all(context, cmd=Proc.new, *args) + _bind_append(['bind', 'all'], context, cmd, *args) TkBindTag::ALL end @@ -2060,12 +2060,12 @@ end module TkBindCore - def bind(context, cmd=Proc.new, args=nil) - Tk.bind(self, context, cmd, args) + def bind(context, cmd=Proc.new, *args) + Tk.bind(self, context, cmd, *args) end - def bind_append(context, cmd=Proc.new, args=nil) - Tk.bind_append(self, context, cmd, args) + def bind_append(context, cmd=Proc.new, *args) + Tk.bind_append(self, context, cmd, *args) end def bind_remove(context) |