diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-08-29 08:34:14 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-08-29 08:34:14 +0000 |
| commit | 24ff3f444882ba60418a6736d6c5d57ba3c0b80c (patch) | |
| tree | 813a69918ff8435617ca58e193f9440c06febdb7 /ext/tk/lib/tkcanvas.rb | |
| parent | 22a5aec4b322c1be9eced78967e5cfd0ae54b6cb (diff) | |
* doc/ChangeLog-1.8.0: add changes of Ruby/Tk
* ext/tcltklib/tcltklib.c : some methods have no effect if on slave-IP
* ext/tcltklib/tcltklib.c : can create a interpreter without Tk
* ext/tcltklib/tcltklib.c : bug fix on handling exceptions
* ext/tcltklib/MANUAL.euc : modify
* ext/tk/lib/tk.rb : freeze some core modules
* ext/tk/lib/multi-tk.rb : more secure
* ext/tk/lib/tk.rb: TkVariable.new(array) --> treat the array as the
Tk's list
* ext/tk/lib/tk.rb: improve accessibility of TkVariable object
* ext/tk/lib/tk.rb, ext/tk/lib/tkfont.rb, ext/tk/lib/tkcanvas.rb,
ext/tk/lib/tktext.rb : fix bug of font handling
* ext/tk/lib/tkfont.rb TkFont.new() accepts compound fonts
* process.c: bug fix
* process.c: add rb_secure(2) to methods of Process::{UID,GID,Sys}
* process.c: deny handling IDs during evaluating the block given to
the Process::{UID,GID}.switch method
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/lib/tkcanvas.rb')
| -rw-r--r-- | ext/tk/lib/tkcanvas.rb | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/ext/tk/lib/tkcanvas.rb b/ext/tk/lib/tkcanvas.rb index a899c9caaf..9e386ee50d 100644 --- a/ext/tk/lib/tkcanvas.rb +++ b/ext/tk/lib/tkcanvas.rb @@ -211,6 +211,12 @@ class TkCanvas<TkWindow end when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile' tk_send 'itemcget', tagid(tagOrId), "-#{option}" + when 'font', 'kanjifont' + fnt = tk_tcl2ruby(tk_send('itemcget', tagid(tagOrId), "-#{option}")) + unless fnt.kind_of?(TkFont) + fnt = tagfontobj(tagid(tagOrId), fnt) + end + fnt else tk_tcl2ruby tk_send('itemcget', tagid(tagOrId), "-#{option}") end @@ -264,6 +270,10 @@ class TkCanvas<TkWindow when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile' conf = tk_split_simplelist(tk_send('itemconfigure', tagid(tagOrId), "-#{key}")) + when 'font', 'kanjifont' + conf = tk_split_simplelist(tk_send('itemconfigure', + tagid(tagOrId),"-#{key}") ) + conf[4] = tagfont_configinfo(tagid(tagOrId), conf[4]) else conf = tk_split_list(tk_send('itemconfigure', tagid(tagOrId), "-#{key}")) @@ -271,8 +281,8 @@ class TkCanvas<TkWindow conf[0] = conf[0][1..-1] conf else - tk_split_simplelist(tk_send('itemconfigure', - tagid(tagOrId))).collect{|conflist| + ret = tk_split_simplelist(tk_send('itemconfigure', + tagid(tagOrId))).collect{|conflist| conf = tk_split_simplelist(conflist) conf[0] = conf[0][1..-1] case conf[0] @@ -302,6 +312,14 @@ class TkCanvas<TkWindow end conf } + fontconf = ret.assoc('font') + if fontconf + ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'} + fontconf[4] = tagfont_configinfo(tagid(tagOrId), fontconf[4]) + ret.push(fontconf) + else + ret + end end end |