[ruby-dev:26771] Re: some questions about tcltklib.c

永井＠知能．九工大です．

From: H.Yamamoto <[e-mail]>
Subject: [ruby-dev:26770] Re: some questions about tcltklib.c
Date: Tue, 9 Aug 2005 16:53:59 +0900
Message-ID: <[e-mail]>
> >treectrl のデモが動くようになりました。
> と思ったら、バインドの解除や
   (snip)
> 設定が動いていません。

ごめんなさい．
ちょっと時間がないのでテスト不十分ですが，
添付のパッチで OK だと思います．

# tkextlib のいくつかにも下記の canvas.rb 同様の修正が要るかも．

Index: ext/tk/lib/tk.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tk.rb,v
retrieving revision 1.102.2.65
diff -u -r1.102.2.65 tk.rb
--- ext/tk/lib/tk.rb	9 Aug 2005 06:15:58 -0000	1.102.2.65
+++ ext/tk/lib/tk.rb	9 Aug 2005 08:19:56 -0000
@@ -2872,8 +2872,7 @@
 
       __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 @@
           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 @@
 
         __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
Index: ext/tk/lib/tk/canvas.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tk/canvas.rb,v
retrieving revision 1.1.2.16
diff -u -r1.1.2.16 canvas.rb
--- ext/tk/lib/tk/canvas.rb	23 Jun 2005 07:57:39 -0000	1.1.2.16
+++ ext/tk/lib/tk/canvas.rb	9 Aug 2005 08:19:57 -0000
@@ -606,6 +606,11 @@
         methodkeys[key] = keys.delete(key) if keys.key?(key)
       }
 
+      __item_ruby2val_optkeys.each{|key, method|
+        key = key.to_s
+        keys[key] = method.call(keys[key]) if keys.has_key?(key)
+      }
+
       #args = args.flatten.concat(hash_kv(keys))
       args = args.flatten.concat(itemconfig_hash_kv(nil, keys))
     else
Index: ext/tk/lib/tk/itemconfig.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tk/itemconfig.rb,v
retrieving revision 1.1.2.8
diff -u -r1.1.2.8 itemconfig.rb
--- ext/tk/lib/tk/itemconfig.rb	9 Aug 2005 06:16:00 -0000	1.1.2.8
+++ ext/tk/lib/tk/itemconfig.rb	9 Aug 2005 08:19:57 -0000
@@ -230,8 +230,7 @@
 
       __item_ruby2val_optkeys(tagid(tagOrId)).each{|key, method|
         key = key.to_s
-        value = slot[key]
-        slot[key] = method.call(tagOrId, value) if value
+        slot[key] = method.call(tagOrId, slot[key]) if slot.has_key?(key)
       }
 
       __item_keyonly_optkeys(tagid(tagOrId)).each{|defkey, undefkey|
@@ -268,7 +267,7 @@
           tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{undefkey}"))
         end
       elsif ( method = _symbolkey2str(__item_ruby2val_optkeys(tagid(tagOrId)))[slot] )
-        method.call(tagOrId, value)
+        tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{slot}" << method.call(tagOrId, value)))
       elsif ( method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot] )
         self.__send__(method, tagOrId, value)
       elsif (slot =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)

-- 
                                       永井 秀利 （九工大 知能情報）
                                           [e-mail]