mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
8cf47d14ab
commit
c22af575a1
3 changed files with 11 additions and 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
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue