mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
e6697a6405
* ext/tk/tcltklib.c: avoid error on a shared object. * ext/tk/extconf.rb: support --with-tcltkversion * ext/tk/README.tcltklib: add document about --with-tcltkversion * ext/tk/lib/tk.rb, ext/tk/lib/multi-tk.rb, ext/tk/lib/remote-tk.rb: not work on $SAFE==4 * ext/tk/lib/multi-tk.rb: Object#methods returns Symbols on Ruby1.9. * ext/tk/lib/tk/timer.rb: add TkTimer#at_end(proc) to register the procedure which called at end of the timer. * ext/tk/lib/tk.rb, ext/tk/lib/tk/itemfont.rb, ext/tk/lib/font.rb: support __IGNORE_UNKNOWN_CONFIGURE_OPTION__ about font options. * ext/tk/lib/*: treat __IGNORE_UNKNOWN_CONFIGURE_OPTION__ * ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb, ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb, ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: bug fix. * ext/tk/lib/tk/text.rb: typo. call a wrong method. * ext/tk/lib/tk/itemconfig.rb: ditto. * ext/tk/lib/tk.rb, ext/tk/lib/tk/itemconfig.rb, ext/tk/lib/tk/canvas.rb: support alias names of option keys. * ext/tk/lib/tk/grid.rb: lack of module-method definitions. * ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: increase supported parameter patterns of configure method. * ext/tk/lib/tk.rb: add TkWindow#grid_anchor, grid_column, grid_row. * ext/tk/lib/tk/wm.rb: methods of Tk::Wm_for_General module cannot pass the given block to methods of Tk::Wm module. * ext/tk/lib/tk/wm.rb: Wm#overrideredirect overwrites arguemnt to an invalid value. * ext/tk/lib/tk.rb: fix memory (object) leak bug. * ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: fix memory leak. * ext/tk/sample/demos-jp/aniwave.rb, ext/tk/sample/demos-en/aniwave.rb: bug fix. * ext/tk/lib/tkextlib/blt/component.rb, ext/tk/lib/tkextlib/tile/tentry.rb, ext/tk/lib/tkextlib/tile/treeview.rb: ditto. * ext/tk/lib/tkextlib/tile/tpaned.rb: improve TPaned#add. * ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget, ext/tk/sample/demos-jp/style.rb, ext/tk/sample/demos-en/style.rb, ext/tk/sample/demos-jp/bind.rb, ext/tk/sample/demos-en/bind.rb: bug fix. * ext/tk/sample/ttk_wrapper.rb: ditto. * ext/tk/sample/ttk_wrapper.rb: support "if __FILE__ == $0" idiom. * ext/tk/sample/tktextio.rb: add binding for 'Ctrl-u' at console mode. * ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb, ext/tk/sample/ttk_wrapper.rb: improve treating and control themes. add Tk::Tile.themes and Tk::Tile.set_theme(theme). * ext/tk/lib/tkextlib/tile.rb: lack of autoload definitions. * ext/tk/lib/tkextlib/tile/tnotebook.rb: cannot use kanji (not UTF-8) characters for headings. * ext/tk/lib/tkextlib/tkDND/shape.rb: wrong package name. * ext/tk/tkutil/tkutil.c: improve handling callback-subst-keys. Now, support longnam-keys (e.g. '%CTT' on tkdnd-2.0; however, still not support tkdnd-2.0 on tkextlib), and symbols of parameters (e.g. :widget=>'%W', :keycode=>'%k', '%x'=>:x, '%X'=>:root_x, and so on; those are attributes of event object). It means that Ruby/Tk accepts not only "widget.bind(ev, '%W', '%k', ...){|w, k, ...| ... }", but also "widget.bind(ev, :widget, :keycode, ...){|w, k, ...| ... }". It is potentially incompatible, when user passes symbols to the arguments of the callback block (the block receives the symbols as strings). I think that is very rare case (probably, used by Ruby/Tk experts only). When causes such trouble, please give strings instead of such symbol parameters (e.g. call Symbol#to_s method). * ext/tk/lib/tk/event.rb, ext/tk/lib/tk/validation.rb, ext/tk/lib/tkextlib/blt/treeview.rb, ext/tk/lib/tkextlib/winico/winico.rb: ditto. * ext/tk/tkutil/tkutil.c: strings are available on subst_tables on TkUtil::CallbackSubst class (it is useful on Ruby 1.9). * ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tkextlib/iwidgets/hierarchy.rb, ext/tk/lib/tkextlib/iwidgets/spinner.rb, ext/tk/lib/tkextlib/iwidgets/entryfield.rb, ext/tk/lib/tkextlib/iwidgets/calendar.rb, ext/tk/lib/tkextlib/blt/dragdrop.rb, ext/tk/lib/tkextlib/tkDND/tkdnd.rb, ext/tk/lib/tkextlib/treectrl/tktreectrl.rb, ext/tk/lib/tkextlib/tktable/tktable.rb: disable code piece became unnecessary by reason of the changes of ext/tk/tkutil/tkutil.c. * ext/tk/lib/tk.rb, ext/tk/lib/multi-tk.rb: change strategy to define the constant WITH_ENCODING. * ext/tk/lib/tk.rb: fix bug on Tk::Encoding.tk_encoding_names. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
353 lines
7.8 KiB
Ruby
353 lines
7.8 KiB
Ruby
#
|
|
# tkextlib/iwidgets/scrolledcanvas.rb
|
|
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
|
|
#
|
|
|
|
require 'tk'
|
|
require 'tk/canvas'
|
|
require 'tkextlib/iwidgets.rb'
|
|
|
|
module Tk
|
|
module Iwidgets
|
|
class Scrolledcanvas < Tk::Iwidgets::Scrolledwidget
|
|
end
|
|
end
|
|
end
|
|
|
|
class Tk::Iwidgets::Scrolledcanvas
|
|
TkCommandNames = ['::iwidgets::scrolledcanvas'.freeze].freeze
|
|
WidgetClassName = 'Scrolledcanvas'.freeze
|
|
WidgetClassNames[WidgetClassName] = self
|
|
|
|
################################
|
|
|
|
def __boolval_optkeys
|
|
super() << 'autoresize'
|
|
end
|
|
private :__boolval_optkeys
|
|
|
|
def __strval_optkeys
|
|
super() << 'textbackground'
|
|
end
|
|
private :__strval_optkeys
|
|
|
|
def initialize(*args)
|
|
super(*args)
|
|
@canvas = component_widget('canvas')
|
|
end
|
|
|
|
def method_missing(id, *args)
|
|
if @canvas.respond_to?(id)
|
|
@canvas.__send__(id, *args)
|
|
else
|
|
super(id, *args)
|
|
end
|
|
end
|
|
|
|
################################
|
|
|
|
def child_site
|
|
window(tk_call(@path, 'childsite'))
|
|
end
|
|
|
|
def justify(dir)
|
|
tk_call(@path, 'justify', dir)
|
|
self
|
|
end
|
|
|
|
##########################
|
|
include TkCanvasItemConfig
|
|
|
|
def tagid(tag)
|
|
if tag.kind_of?(TkcItem) || tag.kind_of?(TkcTag)
|
|
tag.id
|
|
elsif tag.kind_of?(Tk::Itk::Component)
|
|
tag.name
|
|
else
|
|
tag # maybe an Array of configure paramters
|
|
end
|
|
end
|
|
private :tagid
|
|
|
|
# create a canvas item without creating a TkcItem object
|
|
def create(type, *args)
|
|
type.create(self, *args)
|
|
end
|
|
|
|
#######################
|
|
|
|
def addtag(tag, mode, *args)
|
|
tk_send_without_enc('addtag', tagid(tag), mode, *args)
|
|
self
|
|
end
|
|
def addtag_above(tagOrId, target)
|
|
addtag(tagOrId, 'above', tagid(target))
|
|
end
|
|
def addtag_all(tagOrId)
|
|
addtag(tagOrId, 'all')
|
|
end
|
|
def addtag_below(tagOrId, target)
|
|
addtag(tagOrId, 'below', tagid(target))
|
|
end
|
|
def addtag_closest(tagOrId, x, y, halo=None, start=None)
|
|
addtag(tagOrId, 'closest', x, y, halo, start)
|
|
end
|
|
def addtag_enclosed(tagOrId, x1, y1, x2, y2)
|
|
addtag(tagOrId, 'enclosed', x1, y1, x2, y2)
|
|
end
|
|
def addtag_overlapping(tagOrId, x1, y1, x2, y2)
|
|
addtag(tagOrId, 'overlapping', x1, y1, x2, y2)
|
|
end
|
|
def addtag_withtag(tagOrId, tag)
|
|
addtag(tagOrId, 'withtag', tagid(tag))
|
|
end
|
|
|
|
def bbox(tagOrId, *tags)
|
|
list(tk_send_without_enc('bbox', tagid(tagOrId),
|
|
*tags.collect{|t| tagid(t)}))
|
|
end
|
|
|
|
#def itembind(tag, context, cmd=Proc.new, *args)
|
|
# _bind([path, "bind", tagid(tag)], context, cmd, *args)
|
|
# self
|
|
#end
|
|
def itembind(tag, context, *args)
|
|
# if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
|
|
if TkComm._callback_entry?(args[0]) || !block_given?
|
|
cmd = args.shift
|
|
else
|
|
cmd = Proc.new
|
|
end
|
|
_bind([path, "bind", tagid(tag)], context, cmd, *args)
|
|
self
|
|
end
|
|
|
|
#def itembind_append(tag, context, cmd=Proc.new, *args)
|
|
# _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
|
|
# self
|
|
#end
|
|
def itembind_append(tag, context, *args)
|
|
# if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
|
|
if TkComm._callback_entry?(args[0]) || !block_given?
|
|
cmd = args.shift
|
|
else
|
|
cmd = Proc.new
|
|
end
|
|
_bind_append([path, "bind", tagid(tag)], context, cmd, *args)
|
|
self
|
|
end
|
|
|
|
def itembind_remove(tag, context)
|
|
_bind_remove([path, "bind", tagid(tag)], context)
|
|
self
|
|
end
|
|
|
|
def itembindinfo(tag, context=nil)
|
|
_bindinfo([path, "bind", tagid(tag)], context)
|
|
end
|
|
|
|
def canvasx(screen_x, *args)
|
|
#tk_tcl2ruby(tk_send_without_enc('canvasx', screen_x, *args))
|
|
number(tk_send_without_enc('canvasx', screen_x, *args))
|
|
end
|
|
def canvasy(screen_y, *args)
|
|
#tk_tcl2ruby(tk_send_without_enc('canvasy', screen_y, *args))
|
|
number(tk_send_without_enc('canvasy', screen_y, *args))
|
|
end
|
|
|
|
def coords(tag, *args)
|
|
if args == []
|
|
tk_split_list(tk_send_without_enc('coords', tagid(tag)))
|
|
else
|
|
tk_send_without_enc('coords', tagid(tag), *(args.flatten))
|
|
self
|
|
end
|
|
end
|
|
|
|
def dchars(tag, first, last=None)
|
|
tk_send_without_enc('dchars', tagid(tag),
|
|
_get_eval_enc_str(first), _get_eval_enc_str(last))
|
|
self
|
|
end
|
|
|
|
def delete(*args)
|
|
tbl = nil
|
|
TkcItem::CItemID_TBL.mutex.synchronize{
|
|
tbl = TkcItem::CItemID_TBL[self.path]
|
|
}
|
|
if tbl
|
|
find('withtag', *args).each{|item|
|
|
if item.kind_of?(TkcItem)
|
|
TkcItem::CItemID_TBL.mutex.synchronize{
|
|
tbl.delete(item.id)
|
|
}
|
|
end
|
|
}
|
|
end
|
|
tk_send_without_enc('delete', *args.collect{|t| tagid(t)})
|
|
self
|
|
end
|
|
alias remove delete
|
|
|
|
def dtag(tag, tag_to_del=None)
|
|
tk_send_without_enc('dtag', tagid(tag), tag_to_del)
|
|
self
|
|
end
|
|
|
|
def find(mode, *args)
|
|
list(tk_send_without_enc('find', mode, *args)).collect!{|id|
|
|
TkcItem.id2obj(self, id)
|
|
}
|
|
end
|
|
def find_above(target)
|
|
find('above', tagid(target))
|
|
end
|
|
def find_all
|
|
find('all')
|
|
end
|
|
def find_below(target)
|
|
find('below', tagid(target))
|
|
end
|
|
def find_closest(x, y, halo=None, start=None)
|
|
find('closest', x, y, halo, start)
|
|
end
|
|
def find_enclosed(x1, y1, x2, y2)
|
|
find('enclosed', x1, y1, x2, y2)
|
|
end
|
|
def find_overlapping(x1, y1, x2, y2)
|
|
find('overlapping', x1, y1, x2, y2)
|
|
end
|
|
def find_withtag(tag)
|
|
find('withtag', tag)
|
|
end
|
|
|
|
def itemfocus(tagOrId=nil)
|
|
if tagOrId
|
|
tk_send_without_enc('focus', tagid(tagOrId))
|
|
self
|
|
else
|
|
ret = tk_send_without_enc('focus')
|
|
if ret == ""
|
|
nil
|
|
else
|
|
TkcItem.id2obj(self, ret)
|
|
end
|
|
end
|
|
end
|
|
|
|
def gettags(tagOrId)
|
|
list(tk_send_without_enc('gettags', tagid(tagOrId))).collect{|tag|
|
|
TkcTag.id2obj(self, tag)
|
|
}
|
|
end
|
|
|
|
def icursor(tagOrId, index)
|
|
tk_send_without_enc('icursor', tagid(tagOrId), index)
|
|
self
|
|
end
|
|
|
|
def index(tagOrId, idx)
|
|
number(tk_send_without_enc('index', tagid(tagOrId), idx))
|
|
end
|
|
|
|
def insert(tagOrId, index, string)
|
|
tk_send_without_enc('insert', tagid(tagOrId), index,
|
|
_get_eval_enc_str(string))
|
|
self
|
|
end
|
|
|
|
def lower(tag, below=nil)
|
|
if below
|
|
tk_send_without_enc('lower', tagid(tag), tagid(below))
|
|
else
|
|
tk_send_without_enc('lower', tagid(tag))
|
|
end
|
|
self
|
|
end
|
|
|
|
def move(tag, x, y)
|
|
tk_send_without_enc('move', tagid(tag), x, y)
|
|
self
|
|
end
|
|
|
|
def postscript(keys)
|
|
tk_send("postscript", *hash_kv(keys))
|
|
end
|
|
|
|
def raise(tag, above=nil)
|
|
if above
|
|
tk_send_without_enc('raise', tagid(tag), tagid(above))
|
|
else
|
|
tk_send_without_enc('raise', tagid(tag))
|
|
end
|
|
self
|
|
end
|
|
|
|
def scale(tag, x, y, xs, ys)
|
|
tk_send_without_enc('scale', tagid(tag), x, y, xs, ys)
|
|
self
|
|
end
|
|
|
|
def scan_mark(x, y)
|
|
tk_send_without_enc('scan', 'mark', x, y)
|
|
self
|
|
end
|
|
def scan_dragto(x, y)
|
|
tk_send_without_enc('scan', 'dragto', x, y)
|
|
self
|
|
end
|
|
|
|
def select(mode, *args)
|
|
r = tk_send_without_enc('select', mode, *args)
|
|
(mode == 'item')? TkcItem.id2obj(self, r): self
|
|
end
|
|
def select_adjust(tagOrId, index)
|
|
select('adjust', tagid(tagOrId), index)
|
|
end
|
|
def select_clear
|
|
select('clear')
|
|
end
|
|
def select_from(tagOrId, index)
|
|
select('from', tagid(tagOrId), index)
|
|
end
|
|
def select_item
|
|
select('item')
|
|
end
|
|
def select_to(tagOrId, index)
|
|
select('to', tagid(tagOrId), index)
|
|
end
|
|
|
|
def itemtype(tag)
|
|
TkcItem.type2class(tk_send('type', tagid(tag)))
|
|
end
|
|
|
|
def xview(*index)
|
|
if index.size == 0
|
|
list(tk_send_without_enc('xview'))
|
|
else
|
|
tk_send_without_enc('xview', *index)
|
|
self
|
|
end
|
|
end
|
|
def xview_moveto(*index)
|
|
xview('moveto', *index)
|
|
end
|
|
def xview_scroll(*index)
|
|
xview('scroll', *index)
|
|
end
|
|
|
|
def yview(*index)
|
|
if index.size == 0
|
|
list(tk_send_without_enc('yview'))
|
|
else
|
|
tk_send_without_enc('yview', *index)
|
|
self
|
|
end
|
|
end
|
|
def yview_moveto(*index)
|
|
yview('moveto', *index)
|
|
end
|
|
def yview_scroll(*index)
|
|
yview('scroll', *index)
|
|
end
|
|
end
|