kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/tk/lib/multi-tk.rb: On Tcl8.5, MultiTkIp#invoke_hidden doesn't

Browse source 
work (gives wrong order of arguments).
* ext/tk/lib/multi-tk.rb: add MultiTkIp#invoke_hidden_on_namespace
  to support '-namespace' option of 'interp invokehidden' command
  on Tcl8.5.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai 2005-09-01 05:15:19 +00:00
parent f1755966cc
commit 804054e672
3 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Thu Sep 1 14:12:45 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/multi-tk.rb: On Tcl8.5, MultiTkIp#invoke_hidden doesn't
work (gives wrong order of arguments).
* ext/tk/lib/multi-tk.rb: add MultiTkIp#invoke_hidden_on_namespace
to support '-namespace' option of 'interp invokehidden' command
on Tcl8.5.
Wed Aug 31 14:41:30 2005 NAKAMURA Usaku <usa@ruby-lang.org> Wed Aug 31 14:41:30 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/Makefile.sub (OPTFLAGS): default global optimization to * win32/Makefile.sub (OPTFLAGS): default global optimization to

23
ext/tk/lib/multi-tk.rb
View file

@ -2360,11 +2360,12 @@ class MultiTkIp
else else
keys = [] keys = []
end end
keys << _slavearg(slave)
if Tk::TCL_MAJOR_VERSION > 8 || if Tk::TCL_MAJOR_VERSION > 8 ||
(Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5) (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
keys << '--' keys << '--'
end end
keys << _slavearg(slave) << cmd keys << cmd
keys.concat(args) keys.concat(args)
@interp._invoke('interp', 'invokehidden', *keys) @interp._invoke('interp', 'invokehidden', *keys)
end end
@ -2378,12 +2379,13 @@ class MultiTkIp
else else
keys = [] keys = []
end end
keys << _slavearg(slave)
keys << '-global' keys << '-global'
if Tk::TCL_MAJOR_VERSION > 8 || if Tk::TCL_MAJOR_VERSION > 8 ||
(Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5) (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
keys << '--' keys << '--'
end end
keys << _slavearg(slave) << cmd keys << cmd
keys.concat(args) keys.concat(args)
@interp._invoke('interp', 'invokehidden', *keys) @interp._invoke('interp', 'invokehidden', *keys)
end end
@ -2391,6 +2393,23 @@ class MultiTkIp
__getip.invoke_hidden_on_global(slave, cmd, *args) __getip.invoke_hidden_on_global(slave, cmd, *args)
end end
def invoke_hidden_on_namespace(slave, ns, cmd, *args)
# for Tcl8.5 or later
if args[-1].kind_of?(Hash)
keys = _symbolkey2str(args.pop)
else
keys = []
end
keys << _slavearg(slave)
keys << '-namespace' << TkComm._get_eval_string(ns)
keys << '--' << cmd
keys.concat(args)
@interp._invoke('interp', 'invokehidden', *keys)
end
def self.invoke_hidden_on_namespace(slave, ns, cmd, *args)
__getip.invoke_hidden_on_namespace(slave, ns, cmd, *args)
end
def mark_trusted(slave = '') def mark_trusted(slave = '')
@interp._invoke('interp', 'marktrusted', _slavearg(slave)) @interp._invoke('interp', 'marktrusted', _slavearg(slave))
self self

2
ext/tk/lib/tk.rb
View file

@ -4437,7 +4437,7 @@ end
#Tk.freeze #Tk.freeze
module Tk module Tk
RELEASE_DATE = '2005-08-10'.freeze RELEASE_DATE = '2005-09-01'.freeze
autoload :AUTO_PATH, 'tk/variable' autoload :AUTO_PATH, 'tk/variable'
autoload :TCL_PACKAGE_PATH, 'tk/variable' autoload :TCL_PACKAGE_PATH, 'tk/variable'