From b73aa2f6d6046e5030fac65d3e1518dcfce4f35f Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 16 Oct 2003 15:14:41 +0000
Subject: (bug fix) instance variable @frame was used without initializing on
 TkComposite module

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/tk.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ext/tk')

diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 039461117..18f398f2a 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
-- 
cgit