summaryrefslogtreecommitdiff
path: root/ext/tk/lib/tk.rb
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-07 05:28:53 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-07 05:28:53 +0000
commitc24349e32d6cd74e4df9103364af62a59095ef6c (patch)
tree6d388a246fc28bbdd4cb1692515b2cd7df4d4f98 /ext/tk/lib/tk.rb
parentcd97e6e333ee327fbe1aa5ead4ba7776aff818b8 (diff)
* ext/tk/lib/tk.rb: use epath for embedded windows of TkPanedWindow.
* ext/tk/lib/tktext.rb: use epath for embedded windows. * ext/tk/lib/tkcanvas.rb: use epath for window items. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5398 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/lib/tk.rb')
-rw-r--r--ext/tk/lib/tk.rb17
1 files changed, 10 insertions, 7 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 7de4cd5f24..6bae4d8f42 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -4830,16 +4830,18 @@ class TkPanedWindow<TkWindow
fail ArgumentError, "no window in arguments" unless keys
if keys && keys.kind_of?(Hash)
fail ArgumentError, "no window in arguments" if args == []
- args += hash_kv(keys)
+ args = args.collect{|w| w.epath}
+ args.push(hash_kv(keys))
else
args.push(keys) if keys
+ args = args.collect{|w| w.epath}
end
tk_send('add', *args)
self
end
def forget(win, *wins)
- tk_send('forget', win, *wins)
+ tk_send('forget', win.epath, *(wins.collect{|w| w.epath}))
self
end
alias del forget
@@ -4879,14 +4881,14 @@ class TkPanedWindow<TkWindow
end
def panecget(win, key)
- tk_tcl2ruby(tk_send('panecget', win, "-#{key}"))
+ tk_tcl2ruby(tk_send('panecget', win.epath, "-#{key}"))
end
def paneconfigure(win, key, value=nil)
if key.kind_of? Hash
- tk_send('paneconfigure', win, *hash_kv(key))
+ tk_send('paneconfigure', win.epath, *hash_kv(key))
else
- tk_send('paneconfigure', win, "-#{key}", value)
+ tk_send('paneconfigure', win.epath, "-#{key}", value)
end
self
end
@@ -4894,11 +4896,12 @@ class TkPanedWindow<TkWindow
def paneconfiginfo(win, key=nil)
if key
- conf = tk_split_list(tk_send('paneconfigure', win, "-#{key}"))
+ conf = tk_split_list(tk_send('paneconfigure', win.epath, "-#{key}"))
conf[0] = conf[0][1..-1]
conf
else
- tk_split_simplelist(tk_send('paneconfigure', win)).collect{|conflist|
+ tk_split_simplelist(tk_send('paneconfigure',
+ win.epath)).collect{|conflist|
conf = tk_split_simplelist(conflist)
conf[0] = conf[0][1..-1]
if conf[3]