nagai	2009-10-06 06:29:44 +0900 (Tue, 06 Oct 2009)

  New Revision: 25240

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25240

  Log:
    * ext/tk/lib/tk/canvas.rb: *** POTENTIALLY INCOMPATIBLE ***
      'tags' option of a TkcItem object gives a list of TkcTag objects.
    * ext/tk/lib/tkextlib/vu/dial.rb: fix logical bug.
    * ext/tk/lib/tk/canvas.rb, ext/tk/lib/tkextlib/blt/component.rb: 
      lack of support for methodcall_optkeys.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/tk/lib/tk/canvas.rb
    branches/ruby_1_8/ext/tk/lib/tkextlib/blt/component.rb
    branches/ruby_1_8/ext/tk/lib/tkextlib/vu/dial.rb

Index: ruby_1_8/ext/tk/lib/tkextlib/blt/component.rb
===================================================================
--- ruby_1_8/ext/tk/lib/tkextlib/blt/component.rb	(revision 25239)
+++ ruby_1_8/ext/tk/lib/tkextlib/blt/component.rb	(revision 25240)
@@ -1268,7 +1268,7 @@
           args = []
         end
 
-        [args, fontkeys]
+        [args, fontkeys, methodkeys]
       end
       private_class_method :_parse_create_args
 
@@ -1276,18 +1276,20 @@
         unless self::MarkerTypeName
           fail RuntimeError, "#{self} is an abstract class"
         end
-        args, fontkeys = _parse_create_args(keys)
+        args, fontkeys, methodkeys = _parse_create_args(keys)
         idnum = tk_call_without_enc(chart.path, 'marker', 'create',
                                     self::MarkerTypeName, *args)
         chart.marker_configure(idnum, fontkeys) unless fontkeys.empty?
+        chart.marker_configure(idnum, methodkeys) unless methodkeys.empty?
         idnum.to_i  # 'item id' is an integer number
       end
 
       def self.create_type(chart, type, keys={})
-        args, fontkeys = _parse_create_args(keys)
+        args, fontkeys, methodkeys = _parse_create_args(keys)
         idnum = tk_call_without_enc(chart.path, 'marker', 'create',
                                     type, *args)
         chart.marker_configure(idnum, fontkeys) unless fontkeys.empty?
+        chart.marker_configure(idnum, methodkeys) unless methodkeys.empty?
         id = idnum.to_i  # 'item id' is an integer number
         obj = self.allocate
         obj.instance_eval{
Index: ruby_1_8/ext/tk/lib/tkextlib/vu/dial.rb
===================================================================
--- ruby_1_8/ext/tk/lib/tkextlib/vu/dial.rb	(revision 25239)
+++ ruby_1_8/ext/tk/lib/tkextlib/vu/dial.rb	(revision 25240)
@@ -32,10 +32,10 @@
 
   def coords(val = nil)
     if val
-      tk_split_list(tk_send_without_enc('coords'))
-    else
       tk_send_without_enc('coords', val)
       self
+    else
+      tk_split_list(tk_send_without_enc('coords'))
     end
   end
 
Index: ruby_1_8/ext/tk/lib/tk/canvas.rb
===================================================================
--- ruby_1_8/ext/tk/lib/tk/canvas.rb	(revision 25239)
+++ ruby_1_8/ext/tk/lib/tk/canvas.rb	(revision 25240)
@@ -25,7 +25,10 @@
   private :__item_methodcall_optkeys
 
   def __item_val2ruby_optkeys(id)  # { key=>proc, ... }
-    super(id).update('window'=>proc{|i, v| window(v)})
+    super(id).update('window'=>proc{|i, v| window(v)},
+                     'tags'=>proc{|i, v|
+                       simplelist(v).collect{|tag| TkcTag.id2obj(self, tag)}
+                     })
   end
   private :__item_val2ruby_optkeys
 
@@ -690,7 +693,7 @@
       args = args.flatten
     end
 
-    [args, fontkeys]
+    [args, fontkeys, methodkeys]
   end
   private_class_method :_parse_create_args
 
@@ -698,10 +701,11 @@
     unless self::CItemTypeName
       fail RuntimeError, "#{self} is an abstract class"
     end
-    args, fontkeys = _parse_create_args(args)
+    args, fontkeys, methodkeys = _parse_create_args(args)
     idnum = tk_call_without_enc(canvas.path, 'create',
                                 self::CItemTypeName, *args)
     canvas.itemconfigure(idnum, fontkeys) unless fontkeys.empty?
+    canvas.itemconfigure(idnum, methodkeys) unless methodkeys.empty?
     idnum.to_i  # 'canvas item id' is an integer number
   end
   ########################################
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 25239)
+++ ruby_1_8/ChangeLog	(revision 25240)
@@ -1,3 +1,13 @@
+Tue Oct  6 06:26:00 2009  Hidetoshi NAGAI  <nagai@a...>
+
+	* * ext/tk/lib/tk/canvas.rb: *** POTENTIALLY INCOMPATIBLE ***
+	  'tags' option of a TkcItem object should give a list of TkcTag objs.
+
+	* ext/tk/lib/tkextlib/vu/dial.rb: fix logical bug.
+
+	* ext/tk/lib/tk/canvas.rb, ext/tk/lib/tkextlib/blt/component.rb: 
+	  lack of support for methodcall_optkeys.
+
 Sun Oct  4 22:44:03 2009  Takeyuki FUJIOKA  <xibbar@r...>
 
 	* lib/cgi.rb (CGI.unescapeHTML): fix for hex values 80-FF,

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/