From 13d4e3b5cdd1b64913446cc42825db3da4ec424a 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@6633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/tk/menu.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'ext/tk/lib/tk')

diff --git a/ext/tk/lib/tk/menu.rb b/ext/tk/lib/tk/menu.rb
index f0f5dcd2e8..4b94ccd915 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 v1.2.3