From 6d4728513cd18e7e8397d02dbcf396ef15620c20 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 1 Sep 2006 05:09:51 +0000
Subject: * 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/branches/ruby_1_8@10818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/tk.rb      |  2 +-
 ext/tk/lib/tk/font.rb | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'ext/tk')

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
 
-- 
cgit v1.2.3