From 2aefc2f6b2a6515023ecf367ce346ac9b74f8e1b Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 3 Dec 2008 21:03:49 +0000
Subject: * ext/tk/lib/tk/menu.rb: TkOptionMenubutton.new fails to treat  
 'parent' and 'variable' options on a Hash argument.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20476 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/tk/menu.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ext/tk/lib')

diff --git a/ext/tk/lib/tk/menu.rb b/ext/tk/lib/tk/menu.rb
index 3ae0548dd..0e4f419e1 100644
--- a/ext/tk/lib/tk/menu.rb
+++ b/ext/tk/lib/tk/menu.rb
@@ -569,7 +569,7 @@ class Tk::OptionMenubutton<Tk::Menubutton
     keys = _symbolkey2str(keys)
 
     parent = nil
-    if args[0].kind_of?(TkWindow) || args[0] == nil
+    if !args.empty? && (args[0].kind_of?(TkWindow) || args[0] == nil)
       keys.delete('parent') # ignore
       parent = args.shift 
     else
@@ -577,7 +577,7 @@ class Tk::OptionMenubutton<Tk::Menubutton
     end
 
     @variable = nil
-    if args[0].kind_of?(TkVariable) || args[0] == nil
+    if !args.empty? && (args[0].kind_of?(TkVariable) || args[0] == nil)
       keys.delete('variable') # ignore
       @variable = args.shift 
     else
-- 
cgit