diff options
author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-01 05:09:51 +0000 |
---|---|---|
committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-01 05:09:51 +0000 |
commit | c22af575a18f689e31ce07b24a8034b1f751a681 (patch) | |
tree | fd5ec5348f7ac1fd438d99995bb95339be571901 | |
parent | 8cf47d14abdc9e3462fd40d0c2a5cfe3b78f77a3 (diff) | |
download | ruby-c22af575a18f689e31ce07b24a8034b1f751a681.tar.gz |
* ext/tk/lib/tk/font.rb: TkFont#current_configinfo() doesn't work on Tcl/Tk8.x.
* ext/tk/lib/tk.rb: update RELEASE_DATE.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/tk/lib/tk.rb | 2 | ||||
-rw-r--r-- | ext/tk/lib/tk/font.rb | 10 |
3 files changed, 11 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Fri Sep 1 13:52:57 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * ext/tk/lib/tk/font.rb: TkFont#current_configinfo() doesn't work + on Tcl/Tk8.x. + Fri Sep 1 09:32:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * lib/irb/ruby-lex.rb (RubyLex::getc): should not push nil into diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index eefe4b5556..a7f2a5af26 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -4597,7 +4597,7 @@ end #Tk.freeze module Tk - RELEASE_DATE = '2006-07-14'.freeze + RELEASE_DATE = '2006-09-01'.freeze autoload :AUTO_PATH, 'tk/variable' autoload :TCL_PACKAGE_PATH, 'tk/variable' diff --git a/ext/tk/lib/tk/font.rb b/ext/tk/lib/tk/font.rb index de02d4957c..ab58ac5762 100644 --- a/ext/tk/lib/tk/font.rb +++ b/ext/tk/lib/tk/font.rb @@ -1449,7 +1449,7 @@ module TkFont::CoreMethods end else l = tk_split_simplelist(tk_call('font', 'configure', font)) - r = {} + h = {} while key=l.shift if key == '-compound' l.shift @@ -1458,15 +1458,15 @@ module TkFont::CoreMethods val = l.shift case TkFont::OptionType[key] when ?n - r.push [key, num_or_str(val)] + h[key] = num_or_str(val) when ?b - r.push [key, bool(val)] + h[key] = bool(val) else - r.push [key, val] + h[key] = val end end end - r + h end end |