diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-25 11:09:59 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-25 11:09:59 +0000 |
| commit | 9130381a8c65c3465e7bebbf9d2f04d714dc6e2c (patch) | |
| tree | 02f6af077d5c366a6eeada18c87832688bdab086 /ext/tk/lib/tk/panedwindow.rb | |
| parent | cdea7dd4ed77ce9c30ced41dad6949d6176b0252 (diff) | |
* 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/branches/ruby_1_8@8521 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/lib/tk/panedwindow.rb')
| -rw-r--r-- | ext/tk/lib/tk/panedwindow.rb | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/ext/tk/lib/tk/panedwindow.rb b/ext/tk/lib/tk/panedwindow.rb index 4932478ba0..3f4266e4f9 100644 --- a/ext/tk/lib/tk/panedwindow.rb +++ b/ext/tk/lib/tk/panedwindow.rb @@ -107,8 +107,11 @@ class TkPanedWindow<TkWindow # win = win.epath if win.kind_of?(TkObject) win = _epath(win) if key + #conf = tk_split_list(tk_send_without_enc('paneconfigure', + # win, "-#{key}")) conf = tk_split_list(tk_send_without_enc('paneconfigure', - win, "-#{key}")) + win, "-#{key}"), + false, true) conf[0] = conf[0][1..-1] if conf[0] == 'hide' conf[3] = bool(conf[3]) unless conf[3].empty? @@ -116,9 +119,12 @@ class TkPanedWindow<TkWindow end conf else - tk_split_simplelist(tk_send_without_enc('paneconfigure', - win)).collect{|conflist| - conf = tk_split_simplelist(conflist) + #tk_split_simplelist(tk_send_without_enc('paneconfigure', + # win)).collect{|conflist| + # conf = tk_split_simplelist(conflist) + tk_split_simplelist(tk_send_without_enc('paneconfigure', win), + false, false).collect{|conflist| + conf = tk_split_simplelist(conflist, false, true) conf[0] = conf[0][1..-1] if conf[3] if conf[0] == 'hide' @@ -146,8 +152,11 @@ class TkPanedWindow<TkWindow # win = win.epath if win.kind_of?(TkObject) win = _epath(win) if key + #conf = tk_split_list(tk_send_without_enc('paneconfigure', + # win, "-#{key}")) conf = tk_split_list(tk_send_without_enc('paneconfigure', - win, "-#{key}")) + win, "-#{key}"), + false, true) key = conf.shift[1..-1] if key == 'hide' conf[2] = bool(conf[2]) unless conf[2].empty? @@ -156,9 +165,12 @@ class TkPanedWindow<TkWindow { key => conf } else ret = {} - tk_split_simplelist(tk_send_without_enc('paneconfigure', - win)).each{|conflist| - conf = tk_split_simplelist(conflist) + #tk_split_simplelist(tk_send_without_enc('paneconfigure', + # win)).each{|conflist| + # conf = tk_split_simplelist(conflist) + tk_split_simplelist(tk_send_without_enc('paneconfigure', win), + false, false).each{|conflist| + conf = tk_split_simplelist(conflist, false, true) key = conf.shift[1..-1] if key if key == 'hide' |