diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-03 21:03:49 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-03 21:03:49 +0000 |
| commit | 694fab958cca3a0717459ba743d6de0bd7456c16 (patch) | |
| tree | b097ad80c491e930881049027bf1df2d1cfa13a1 /ext/tk | |
| parent | 57746bb6fa6e52c314f4106f7338fef37e3cfe4a (diff) | |
* ext/tk/lib/tk/menu.rb: TkOptionMenubutton.new fails to treat
'parent' and 'variable' options on a Hash argument.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20476 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk')
| -rw-r--r-- | ext/tk/lib/tk/menu.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/tk/lib/tk/menu.rb b/ext/tk/lib/tk/menu.rb index 3ae0548dd1..0e4f419e15 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 |