mirror of
https://github.com/ruby/ruby.git
synced 2025-09-17 09:33:59 +02:00
* ext/tk/lib/tk.rb: fix bug on handling __ruby2val_optkeys().
* ext/tk/lib/tk/itemconfig.rb: fix bug on handling __item_ruby2val_optkeys(). * ext/tk/lib/tk/canvas.rb: didn't check __item_ruby2val_optkeys(). * ext/tk/lib/tkextlib/blt/component.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8961 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
80766db4ae
commit
38a63b25bc
7 changed files with 33 additions and 10 deletions
|
@ -2872,8 +2872,7 @@ module TkConfigMethod
|
|||
|
||||
__ruby2val_optkeys.each{|key, method|
|
||||
key = key.to_s
|
||||
value = slot[key]
|
||||
slot[key] = method.call(value) if value
|
||||
slot[key] = method.call(slot[key]) if slot.has_key?(key)
|
||||
}
|
||||
|
||||
__keyonly_optkeys.each{|defkey, undefkey|
|
||||
|
@ -2910,7 +2909,7 @@ module TkConfigMethod
|
|||
tk_call(*(__config_cmd << "-#{undefkey}"))
|
||||
end
|
||||
elsif ( method = _symbolkey2str(__ruby2val_optkeys)[slot] )
|
||||
method.call(value)
|
||||
tk_call(*(__config_cmd << "-#{slot}" << method.call(value)))
|
||||
elsif ( method = _symbolkey2str(__methodcall_optkeys)[slot] )
|
||||
self.__send__(method, value)
|
||||
elsif (slot =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/)
|
||||
|
@ -3884,8 +3883,7 @@ class TkWindow<TkObject
|
|||
|
||||
__ruby2val_optkeys.each{|key, method|
|
||||
key = key.to_s
|
||||
value = keys[key]
|
||||
keys[key] = method.call(value) if value
|
||||
keys[key] = method.call(keys[key]) if keys.has_key?(key)
|
||||
}
|
||||
end
|
||||
if without_creating && keys
|
||||
|
@ -4439,7 +4437,7 @@ end
|
|||
#Tk.freeze
|
||||
|
||||
module Tk
|
||||
RELEASE_DATE = '2005-08-09'.freeze
|
||||
RELEASE_DATE = '2005-08-10'.freeze
|
||||
|
||||
autoload :AUTO_PATH, 'tk/variable'
|
||||
autoload :TCL_PACKAGE_PATH, 'tk/variable'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue