summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/tk/lib/tk.rb2
-rw-r--r--ext/tk/lib/tk/font.rb10
3 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 6148ec3d1c..e684030f19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
+
Thu Aug 31 12:46:55 2006 why the lucky stiff <why@ruby-lang.org>
* eval.c (ruby_init): rename top_cref to ruby_top_cref and export,
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