[ruby-dev:26750] Re: TkCheckbutton#variable as getter?

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

From: Hidetoshi NAGAI <[e-mail]>
Subject: [ruby-dev:26749] Re: TkCheckbutton#variable as getter?
Date: Fri, 5 Aug 2005 15:23:59 +0900
Message-ID: <[e-mail]>
> 添付の patch ではいかがでしょうか．

添付のものでは tk/radiobutton.rb の分は含まれていませんが，
v のデフォルト値は None にして， TkVarAccess.new での wrap は
行いません．

また，互換性を考えると，tk/variable.rb にも
添付のパッチが必要でしょうね．

Index: ext/tk/lib/tk/variable.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tk/variable.rb,v
retrieving revision 1.1.2.18
diff -u -r1.1.2.18 variable.rb
--- ext/tk/lib/tk/variable.rb	3 Aug 2005 13:10:04 -0000	1.1.2.18
+++ ext/tk/lib/tk/variable.rb	5 Aug 2005 06:42:51 -0000
@@ -1529,12 +1529,36 @@
 
 class TkVarAccess<TkVariable
   def self.new(name, *args)
-    return TkVar_ID_TBL[name] if TkVar_ID_TBL[name]
+    if name.kind_of?(TkVariable)
+      name.value = args[0] unless args.empty?
+      return name 
+    end
+
+    if v = TkVar_ID_TBL[name]
+      v.value = args[0] unless args.empty?
+      return v
+    end
+
     super(name, *args)
   end
 
   def self.new_hash(name, *args)
-    return TkVar_ID_TBL[name] if TkVar_ID_TBL[name]
+    if name.kind_of?(TkVariable)
+      unless name.is_hash?
+        fail ArgumentError, "already exist as a scalar variable"
+      end
+      name.value = args[0] unless args.empty?
+      return name 
+    end
+
+    if v = TkVar_ID_TBL[name]
+      unless v.is_hash?
+        fail ArgumentError, "already exist as a scalar variable"
+      end
+      v.value = args[0] unless args.empty?
+      return v
+    end
+
     INTERP._invoke_without_enc('global', name)
     if args.empty? && INTERP._invoke_without_enc('array', 'exist', name) == '0'
       self.new(name, {})  # force creating

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