mirror of
https://github.com/ruby/ruby.git
synced 2025-09-15 08:33:58 +02:00
* ext/tk/lib/tk.rb: TkComm#tk_split_*list fail to split a kind of SJIS
strings. To avoid the trouble, add arguments to control converting encoding, and do split on a UTF8 string. * ext/tk/lib/multi-tk.rb: modify to attend encoding. * ext/tk/lib/remote-tk.rb: ditto. * ext/tk/lib/tk/itemconfig.rb: ditto. * ext/tk/lib/tk/listbox.rb: ditto. * ext/tk/lib/tk/namespace.rb: ditto. * ext/tk/lib/tk/panedwindow.rb: ditto. * ext/tk/lib/tk/text.rb: ditto. * ext/tk/lib/tk/textmark.rb: ditto. * ext/tk/lib/tk/texttag.rb: ditto. * ext/tk/lib/tk/variable.rb: ditto. * ext/tk/lib/tk/winfo.rb: ditto. * ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb: ditto. * ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: ditto. * ext/tk/lib/tk.rb: add TkWindow#lower_window/raise_window and Tk#lower_window/raise_window by reason of method-name conflict * ext/tk/lib/tk/canvas.rb: bug fix on TkCanvas#delete when given non-TkcItem arguments. * ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8521 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
ac5925d2ab
commit
90537dbe3c
18 changed files with 289 additions and 108 deletions
|
@ -197,7 +197,9 @@ class MultiTkIp
|
|||
|
||||
def _destroy_slaves_of_slaveIP(ip)
|
||||
unless ip.deleted?
|
||||
ip._split_tklist(ip._invoke('interp', 'slaves')).each{|name|
|
||||
# ip._split_tklist(ip._invoke('interp', 'slaves')).each{|name|
|
||||
ip._split_tklist(ip._invoke_without_enc('interp', 'slaves')).each{|name|
|
||||
name = _fromUTF8(name)
|
||||
begin
|
||||
# ip._eval_without_enc("#{name} eval {foreach i [after info] {after cancel $i}}")
|
||||
after_ids = ip._eval_without_enc("#{name} eval {after info}")
|
||||
|
@ -2397,8 +2399,10 @@ class MultiTkIp
|
|||
num_or_str(@interp._invoke('interp', 'limit', _slavearg(slave),
|
||||
limit_type, slot))
|
||||
else
|
||||
l = @interp._split_tklist(@interp._invoke('interp', 'limit',
|
||||
_slavearg(slave), limit_type))
|
||||
l = @interp._split_tklist(@interp._invoke_without_enc('interp', 'limit',
|
||||
_slavearg(slave),
|
||||
limit_type))
|
||||
l.map!{|s| _fromUTF8(s)}
|
||||
r = {}
|
||||
until l.empty?
|
||||
key = l.shift[1..-1]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue