diff options
author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-15 04:49:01 +0000 |
---|---|---|
committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-15 04:49:01 +0000 |
commit | 13d4e3b5cdd1b64913446cc42825db3da4ec424a (patch) | |
tree | bd65f7250c7a35cd8c6c1a7b24dd0fb4b1cdea8b /ext/tk/lib | |
parent | 07aef3a89c7e38ac1148d75a665d1673db143495 (diff) | |
download | ruby-13d4e3b5cdd1b64913446cc42825db3da4ec424a.tar.gz |
* 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
Diffstat (limited to 'ext/tk/lib')
-rw-r--r-- | ext/tk/lib/tk.rb | 6 | ||||
-rw-r--r-- | ext/tk/lib/tk/menu.rb | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index 312452df1d..907f602da5 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 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 |