diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-01-28 08:44:45 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-01-28 08:44:45 +0000 |
| commit | 4f38c453b4fccfbc529909781c2c1659f256697b (patch) | |
| tree | f5f2eb688ce0d96f6b51515366f2dbf048cc3639 /ext/tk | |
| parent | ae6afaaedbe2c88abbfc315a66685e6b99e4050c (diff) | |
* eval.c (is_defined): defined?(Foo::Baz) should check constants
only, no methods.
* eval.c (is_defined): should not dump core on defined?(a::b)
where a is not a class nor a module.
* object.c (Init_Object): remove dup and clone from TrueClass,
FalseClass, and NilClass.
* array.c (rb_ary_fill): Array#fill takes block to get the value to
fill.
* string.c (rb_str_to_i): to_i(0) auto-detects base radix.
* array.c (rb_ary_initialize): fill by the block evaluation value
if block is given.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2021 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk')
| -rw-r--r-- | ext/tk/lib/tk.rb | 5 | ||||
| -rw-r--r-- | ext/tk/lib/tkfont.rb | 4 | ||||
| -rw-r--r-- | ext/tk/lib/tktext.rb | 16 |
3 files changed, 16 insertions, 9 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index 26b3dca034..066864a237 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -93,7 +93,6 @@ module TkComm brace -= 1 if c == ?} break if brace == 0 } - p str[0,i] if str[0, i] == ' ' list.push ' ' else @@ -1318,7 +1317,7 @@ class TkVariable opts = ['r','w','u'].find_all{|c| opts.index(c)}.join('') idx = -1 newopts = '' - @trace_var.each_with_index{|i,e| + @trace_var.each_with_index{|e,i| if idx < 0 && e[0] == opts && e[1] == cmd idx = i next @@ -1352,7 +1351,7 @@ class TkVariable return unless @trace_elem[elem].kind_of? Array opts = ['r','w','u'].find_all{|c| opts.index(c)}.join('') idx = -1 - @trace_elem[elem].each_with_index{|i,e| + @trace_elem[elem].each_with_index{|e,i| if idx < 0 && e[0] == opts && e[1] == cmd idx = i next diff --git a/ext/tk/lib/tkfont.rb b/ext/tk/lib/tkfont.rb index c44b215ee9..c1e45cbe54 100644 --- a/ext/tk/lib/tkfont.rb +++ b/ext/tk/lib/tkfont.rb @@ -173,8 +173,8 @@ class TkFont TkFont.new(nil, nil).call_font_configure(path, *(args + [{}])) else begin - compound = Hash[*list(tk_call('font', 'configure', - fnt))].collect{|key,value| + compound = Hash[*tk_split_simplelist(tk_call('font', 'configure', + fnt))].collect{|key,value| [key[1..-1], value] }.assoc('compound')[1] rescue diff --git a/ext/tk/lib/tktext.rb b/ext/tk/lib/tktext.rb index 6ec738edb0..f7d93618f9 100644 --- a/ext/tk/lib/tktext.rb +++ b/ext/tk/lib/tktext.rb @@ -813,12 +813,20 @@ class TkTextMark<TkObject tk_call @t.path, 'mark', 'gravity', @id, direction end - def next(index) - @t.tagid2obj(tk_call(@t.path, 'mark', 'next', index)) + def next(index = nil) + if index + @t.tagid2obj(tk_call(@t.path, 'mark', 'next', index)) + else + @t.tagid2obj(tk_call(@t.path, 'mark', 'next', @id)) + end end - def previous(index) - @t.tagid2obj(tk_call(@t.path, 'mark', 'previous', index)) + def previous(index = nil) + if index + @t.tagid2obj(tk_call(@t.path, 'mark', 'previous', index)) + else + @t.tagid2obj(tk_call(@t.path, 'mark', 'previous', @id)) + end end end |