From b12a66055a29a3db3d9e9deda4d0867d0b837ea3 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 15 Jul 2004 04:49:01 +0000
Subject: * ext/tk/sample/tkextlib/tktable/spreadsheet.rb: add a new sample

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/tk.rb      | 6 +++---
 ext/tk/lib/tk/menu.rb | 9 ++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'ext/tk/lib')

diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 312452df1..907f602da 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -3165,9 +3165,9 @@ class TkObject<TkKernel
   end
 
   def tk_trace_variable(v)
-    unless v.kind_of?(TkVariable)
-      fail(ArgumentError, "type error (#{v.class}); must be TkVariable object")
-    end
+    #unless v.kind_of?(TkVariable)
+    #  fail(ArgumentError, "type error (#{v.class}); must be TkVariable object")
+    #end
     v
   end
   private :tk_trace_variable
diff --git a/ext/tk/lib/tk/menu.rb b/ext/tk/lib/tk/menu.rb
index f0f5dcd2e..4b94ccd91 100644
--- a/ext/tk/lib/tk/menu.rb
+++ b/ext/tk/lib/tk/menu.rb
@@ -402,13 +402,20 @@ class TkOptionMenubutton<TkMenubutton
     end
   end
 
-  def initialize(parent=nil, var=TkVariable.new, firstval=nil, *vals)
+  def initialize(parent=nil, var=nil, firstval=nil, *vals)
     if parent.kind_of? Hash
        keys = _symbolkey2str(parent)
        parent = keys['parent']
        var = keys['variable'] if keys['variable']
        firstval, *vals = keys['values']
     end
+    if parent.kind_of? TkVariable
+      vals.unshift(firstval) if firstval
+      firstval = var 
+      var = parent
+      parent = nil
+    end
+    var = TkVariable.new unless var
     fail 'variable option must be TkVariable' unless var.kind_of? TkVariable
     @variable = var
     firstval = @variable.value unless firstval
-- 
cgit