mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
(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
This commit is contained in:
parent
6559430fb7
commit
653ad6fd4b
2 changed files with 7 additions and 1 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Fri Oct 17 00:12:41 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
|
||||||
|
|
||||||
|
* 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 <nagai@ai.kyutech.ac.jp>
|
Thu Oct 16 23:51:04 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
|
||||||
|
|
||||||
* ext/tk/lib/tk.rb: If $DEBUG == true and some exception is caused
|
* ext/tk/lib/tk.rb: If $DEBUG == true and some exception is caused
|
||||||
|
|
|
@ -5664,16 +5664,17 @@ module TkComposite
|
||||||
|
|
||||||
def initialize(parent=nil, *args)
|
def initialize(parent=nil, *args)
|
||||||
@delegates = {}
|
@delegates = {}
|
||||||
@delegates['DEFAULT'] = @frame
|
|
||||||
|
|
||||||
if parent.kind_of? Hash
|
if parent.kind_of? Hash
|
||||||
keys = _symbolkey2str(parent)
|
keys = _symbolkey2str(parent)
|
||||||
parent = keys['parent']
|
parent = keys['parent']
|
||||||
keys['parent'] = @frame = TkFrame.new(parent)
|
keys['parent'] = @frame = TkFrame.new(parent)
|
||||||
|
@delegates['DEFAULT'] = @frame
|
||||||
@path = @epath = @frame.path
|
@path = @epath = @frame.path
|
||||||
initialize_composite(keys)
|
initialize_composite(keys)
|
||||||
else
|
else
|
||||||
@frame = TkFrame.new(parent)
|
@frame = TkFrame.new(parent)
|
||||||
|
@delegates['DEFAULT'] = @frame
|
||||||
@path = @epath = @frame.path
|
@path = @epath = @frame.path
|
||||||
initialize_composite(*args)
|
initialize_composite(*args)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue