summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-18 15:05:01 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-18 15:05:01 +0000
commit60976b119fc87722a52fe886b1cb3a76592f1d11 (patch)
treecb011395327c49fc13615abcee15c289fbd0cf8b
parent6dea5cdb5be0761b42dd8dc7fb7c32aebd2c3d9e (diff)
* ext/tk/lib/multi-tk.rb: fix bug: initialize improper tables
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10319 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/tk/lib/multi-tk.rb5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d626d9dea..bd06ed136b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun 19 00:00:17 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/multi-tk.rb: fix bug: initialize improper tables.
+
Sun Jun 18 20:28:43 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (fole_methods): The return value
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
index 8fc99dff73..408dd0fc30 100644
--- a/ext/tk/lib/multi-tk.rb
+++ b/ext/tk/lib/multi-tk.rb
@@ -1405,7 +1405,7 @@ class MultiTkIp
end
def _init_ip_env(script)
- script.call(self)
+ self.eval_proc{script.call(self)}
end
def _add_tk_procs(name, args, body)
@@ -1417,7 +1417,8 @@ class MultiTkIp
end
def _init_ip_internal(init_ip_env, add_tk_procs)
- init_ip_env.each{|script| script.call(self)}
+ #init_ip_env.each{|script| self.eval_proc{script.call(self)}}
+ init_ip_env.each{|script| self._init_ip_env(script)}
add_tk_procs.each{|name, args, body|
if master?
@interp._invoke('proc', name, args, body) if args && body