diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-10-16 15:14:41 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-10-16 15:14:41 +0000 |
| commit | b73aa2f6d6046e5030fac65d3e1518dcfce4f35f (patch) | |
| tree | 10a4fd3f2c5b998eedf4058a0b2290826b7fbc90 | |
| parent | 4c78e0d25fe147710d27718cb8d9030d4bfdfea1 (diff) | |
| download | ruby-b73aa2f6d6046e5030fac65d3e1518dcfce4f35f.tar.gz ruby-b73aa2f6d6046e5030fac65d3e1518dcfce4f35f.tar.xz ruby-b73aa2f6d6046e5030fac65d3e1518dcfce4f35f.zip | |
(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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/tk/lib/tk.rb | 3 |
2 files changed, 7 insertions, 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> * 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 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 |