From 653ad6fd4bb186157514f36ca100917e09dfd78d Mon Sep 17 00:00:00 2001 From: nagai Date: Thu, 16 Oct 2003 15:14:41 +0000 Subject: [PATCH] (bug fix) instance variable @frame was used without initializing on TkComposite module git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/tk/lib/tk.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5e79eb0dd6..306fabbe36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 17 00:12:41 2003 Hidetoshi NAGAI + + * ext/tk/lib/tk.rb: (bug fix) instance variable @frame was used + without initializing on TkComposite module + Thu Oct 16 23:51:04 2003 Hidetoshi NAGAI * ext/tk/lib/tk.rb: If $DEBUG == true and some exception is caused diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index 0394611172..18f398f2aa 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -5664,16 +5664,17 @@ module TkComposite def initialize(parent=nil, *args) @delegates = {} - @delegates['DEFAULT'] = @frame if parent.kind_of? Hash keys = _symbolkey2str(parent) parent = keys['parent'] keys['parent'] = @frame = TkFrame.new(parent) + @delegates['DEFAULT'] = @frame @path = @epath = @frame.path initialize_composite(keys) else @frame = TkFrame.new(parent) + @delegates['DEFAULT'] = @frame @path = @epath = @frame.path initialize_composite(*args) end