summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/cgi-lib.rb6
-rw-r--r--lib/tk.rb10
2 files changed, 10 insertions, 6 deletions
diff --git a/lib/cgi-lib.rb b/lib/cgi-lib.rb
index 2407c6b388..362d13f8d0 100644
--- a/lib/cgi-lib.rb
+++ b/lib/cgi-lib.rb
@@ -60,7 +60,11 @@ class CGI < SimpleDelegator
read_from_cmdline
end.split(/&/).each do |x|
key, val = x.split(/=/,2).collect{|x|unescape(x)}
- @inputs[key] += ("\0" if @inputs[key]) + (val or "")
+ if @inputs.include?('key')
+ @inputs[key] += "\0" + (val or "")
+ else
+ @inputs[key] = (val or "")
+ end
end
super(@inputs)
diff --git a/lib/tk.rb b/lib/tk.rb
index 62b275b432..b44f585b0f 100644
--- a/lib/tk.rb
+++ b/lib/tk.rb
@@ -812,11 +812,11 @@ module TkGrid
end
def columnconfigure(master, index, *args)
- tk_call "grid", 'columnconfigure', master, index, *hash_kv(keys)
+ tk_call "grid", 'columnconfigure', master, index, *hash_kv(args)
end
def rowconfigure(master, index, *args)
- tk_call "grid", 'rowconfigure', master, index, *hash_kv(keys)
+ tk_call "grid", 'rowconfigure', master, index, *hash_kv(args)
end
def add(widget, *args)
@@ -1301,10 +1301,10 @@ class TkMenu<TkWindow
def index(index)
tk_send 'index', index
end
- def invoke
- tk_send 'invoke'
+ def invoke(index)
+ tk_send 'invoke', index
end
- def insert(index, type, *keys)
+ def insert(index, type, keys=nil)
tk_send 'add', index, type, *hash_kv(keys)
end
def post(x, y)