summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-10-16 15:14:41 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-10-16 15:14:41 +0000
commit653ad6fd4bb186157514f36ca100917e09dfd78d (patch)
tree10a4fd3f2c5b998eedf4058a0b2290826b7fbc90 /ext
parent6559430fb75e921622f34d04049b2dfd46006ea8 (diff)
(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
Diffstat (limited to 'ext')
-rw-r--r--ext/tk/lib/tk.rb3
1 files changed, 2 insertions, 1 deletions
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