From 3dd3b2136b0050c669d0881ae804b1fae8ea6567 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 22 Oct 2005 22:17:08 +0000
Subject: * ext/tk/extconf.rb: improbe messages [ruby-core:06325]. *
 ext/tk/lib/tk.rb, ext/tk/lib/tk/canvas.rb, ext/tk/lib/tk/entry.rb,  
 ext/tk/lib/tk/frame.rb, ext/tk/lib/tk/image.rb,  
 ext/tk/lib/tk/itemconfig.rb, ext/tk/lib/tk/labelframe.rb,  
 ext/tk/lib/tk/listbox.rb, ext/tk/lib/tk/menu.rb,  
 ext/tk/lib/tk/radiobutton.rb, ext/tk/lib/tk/scale.rb,  
 ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tk/text.rb,   ext/tk/lib/tk/toplevel.rb:
 improve conversion of option values. * ext/tk/lib/tkextlib/*: ditto. *
 ext/tk/lib/tkextlib/*: update to support ActiveTcl8.4.11.2. *
 ext/tk/lib/tkextlib/trofs/*: support Trofs 0.4.3. *
 ext/tk/lib/tkextlib/tile/*: support Tile 0.7.2. * ext/tk/lib/tkextlib/vu/*:
 support vu 2.3.0. * ext/tk/lib/tkextlib/tcllib/*: support Tcllib 1.8 (Tklib
 0.3).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9448 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/tk/canvas.rb | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'ext/tk/lib/tk/canvas.rb')

diff --git a/ext/tk/lib/tk/canvas.rb b/ext/tk/lib/tk/canvas.rb
index 97bc6cc14a..94b43ebc39 100644
--- a/ext/tk/lib/tk/canvas.rb
+++ b/ext/tk/lib/tk/canvas.rb
@@ -11,11 +11,25 @@ require 'tk/scrollable'
 module TkCanvasItemConfig
   include TkItemConfigMethod
 
+  def __item_strval_optkeys(id)
+    # maybe need to override
+    super(id) + [
+      'fill', 'activefill', 'disabledfill', 
+      'outline', 'activeoutline', 'disabledoutline'
+    ]
+  end
+  private :__item_strval_optkeys
+
   def __item_methodcall_optkeys(id)
     {'coords'=>'coords'}
   end
   private :__item_methodcall_optkeys
 
+  def __item_val2ruby_optkeys(id)  # { key=>proc, ... }
+    super(id).update('window'=>proc{|i, v| window(v)})
+  end
+  private :__val2ruby_optkeys
+
   def __item_pathname(tagOrId)
     if tagOrId.kind_of?(TkcItem) || tagOrId.kind_of?(TkcTag)
       self.path + ';' + tagOrId.id.to_s
@@ -47,6 +61,16 @@ class TkCanvas<TkWindow
   #end
   #private :create_self
 
+  def __numval_optkeys
+    super() + ['closeenough']
+  end
+  private :__numval_optkeys
+
+  def __boolval_optkeys
+    super() + ['confine']
+  end
+  private :__boolval_optkeys
+
   def tagid(tag)
     if tag.kind_of?(TkcItem) || tag.kind_of?(TkcTag)
       tag.id
-- 
cgit v1.2.3