From 4e0ca3571906616cba917628dd3bdf44ca82bacd Mon Sep 17 00:00:00 2001 From: nagai Date: Wed, 25 May 2005 11:09:59 +0000 Subject: * 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8521 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/tk/lib/remote-tk.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ext/tk/lib/remote-tk.rb') diff --git a/ext/tk/lib/remote-tk.rb b/ext/tk/lib/remote-tk.rb index 03b6a45e5..bb2a2c114 100644 --- a/ext/tk/lib/remote-tk.rb +++ b/ext/tk/lib/remote-tk.rb @@ -70,7 +70,7 @@ class RemoteTkIp @interp = MultiTkIp.__getip @interp.allow_ruby_exit = false @appname = @interp._invoke('tk', 'appname') - @remote = remote_ip.dup.freeze + @remote = remote_ip.to_s.dup.freeze if displayof.kind_of?(TkWindow) @displayof = displayof.path.dup.freeze else @@ -275,7 +275,8 @@ class RemoteTkIp else lst = @interp._invoke_without_enc('winfo', 'interps') end - unless @interp._split_tklist(lst).index(@remote) + # unless @interp._split_tklist(lst).index(@remote) + unless @interp._split_tklist(lst).index(_toUTF8(@remote)) true else false -- cgit