summaryrefslogtreecommitdiff
path: root/ext/tk/lib/tk.rb
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-10 01:32:44 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-10 01:32:44 +0000
commit5a0361f84c28d38747c066bda30ecf77483877f9 (patch)
treeac8d61ff69964b97fcd75cf933eb71a2bde87596 /ext/tk/lib/tk.rb
parent599a478ad5046374fa7c0809ac3bc67d57da6ce0 (diff)
* 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/trunk@8961 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/lib/tk.rb')
-rw-r--r--ext/tk/lib/tk.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index bffb0d26ca..576ba3b1f4 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -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-04'.freeze
+ RELEASE_DATE = '2005-08-10'.freeze
autoload :AUTO_PATH, 'tk/variable'
autoload :TCL_PACKAGE_PATH, 'tk/variable'