diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-07-17 05:12:48 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-07-17 05:12:48 +0000 |
| commit | c2fa49a9b453621dbe80630f3be88223fe10ab29 (patch) | |
| tree | b7c9e8cc04031fd40639c05c2e96544d80934c1b /lib/tkcanvas.rb | |
| parent | 20e305950e9fb53e1b1cb338f9b04b1be43fd7bb (diff) | |
1.1c0
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@270 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/tkcanvas.rb')
| -rw-r--r-- | lib/tkcanvas.rb | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/tkcanvas.rb b/lib/tkcanvas.rb index 613e97af38..3beb2ff1dc 100644 --- a/lib/tkcanvas.rb +++ b/lib/tkcanvas.rb @@ -60,8 +60,11 @@ module TkTreatCItemFont fobj = tagfontobj(tagOrId) if ltn.kind_of? TkFont conf = {} - ltn.latin_configinfo.each{|key,val| conf[key] = val} - if keys + ltn.latin_configinfo.each{|key,val| conf[key] = val if val != []} + if conf == {} + fobj.latin_replace(ltn) + fobj.latin_configure(keys) if keys + elsif keys fobj.latin_configure(conf.update(keys)) else fobj.latin_configure(conf) @@ -76,8 +79,11 @@ module TkTreatCItemFont fobj = tagfontobj(tagOrId) if knj.kind_of? TkFont conf = {} - knj.kanji_configinfo.each{|key,val| conf[key] = val} - if keys + knj.kanji_configinfo.each{|key,val| conf[key] = val if val != []} + if conf == {} + fobj.kanji_replace(knj) + fobj.kanji_configure(keys) if keys + elsif keys fobj.kanji_configure(conf.update(keys)) else fobj.kanji_configure(conf) |