mirror of
https://github.com/ruby/ruby.git
synced 2025-08-27 15:06:10 +02:00

* 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
177 lines
4.3 KiB
Ruby
177 lines
4.3 KiB
Ruby
#
|
|
# tk/scrollbar.rb : treat scrollbar widget
|
|
#
|
|
require 'tk'
|
|
|
|
class Tk::Scrollbar<TkWindow
|
|
TkCommandNames = ['scrollbar'.freeze].freeze
|
|
WidgetClassName = 'Scrollbar'.freeze
|
|
WidgetClassNames[WidgetClassName] = self
|
|
|
|
def create_self(keys)
|
|
@assigned = []
|
|
@scroll_proc = proc{|*args|
|
|
if self.orient == 'horizontal'
|
|
@assigned.each{|w| w.xview(*args)}
|
|
else # 'vertical'
|
|
@assigned.each{|w| w.yview(*args)}
|
|
end
|
|
}
|
|
|
|
if keys and keys != None
|
|
unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
|
|
#tk_call_without_enc('scrollbar', @path, *hash_kv(keys, true))
|
|
tk_call_without_enc(self.class::TkCommandNames[0], @path,
|
|
*hash_kv(keys, true))
|
|
else
|
|
begin
|
|
tk_call_without_enc(self.class::TkCommandNames[0], @path,
|
|
*hash_kv(keys, true))
|
|
rescue
|
|
tk_call_without_enc(self.class::TkCommandNames[0], @path)
|
|
keys = __check_available_configure_options(keys)
|
|
unless keys.empty?
|
|
begin
|
|
tk_call_without_enc('destroy', @path)
|
|
rescue
|
|
# cannot destroy
|
|
configure(keys)
|
|
else
|
|
# re-create widget
|
|
tk_call_without_enc(self.class::TkCommandNames[0], @path,
|
|
*hash_kv(keys, true))
|
|
end
|
|
end
|
|
end
|
|
end
|
|
else
|
|
#tk_call_without_enc('scrollbar', @path)
|
|
tk_call_without_enc(self.class::TkCommandNames[0], @path)
|
|
end
|
|
end
|
|
private :create_self
|
|
|
|
def propagate_set(src_win, first, last)
|
|
self.set(first, last)
|
|
if self.orient == 'horizontal'
|
|
@assigned.each{|w| w.xview('moveto', first) if w != src_win}
|
|
else # 'vertical'
|
|
@assigned.each{|w| w.yview('moveto', first) if w != src_win}
|
|
end
|
|
end
|
|
|
|
def assign(*wins)
|
|
begin
|
|
self.command(@scroll_proc) if self.cget('command').cmd != @scroll_proc
|
|
rescue Exception
|
|
self.command(@scroll_proc)
|
|
end
|
|
orient = self.orient
|
|
wins.each{|w|
|
|
@assigned << w unless @assigned.index(w)
|
|
if orient == 'horizontal'
|
|
w.xscrollcommand proc{|first, last| self.propagate_set(w, first, last)}
|
|
else # 'vertical'
|
|
w.yscrollcommand proc{|first, last| self.propagate_set(w, first, last)}
|
|
end
|
|
}
|
|
Tk.update # avoid scrollbar trouble
|
|
self
|
|
end
|
|
|
|
def assigned_list
|
|
begin
|
|
return @assigned.dup if self.cget('command').cmd == @scroll_proc
|
|
rescue Exception
|
|
end
|
|
fail RuntimeError, "not depend on the assigned_list"
|
|
end
|
|
|
|
def configure(*args)
|
|
ret = super(*args)
|
|
# Tk.update # avoid scrollbar trouble
|
|
ret
|
|
end
|
|
|
|
#def delta(deltax=None, deltay=None)
|
|
def delta(deltax, deltay)
|
|
number(tk_send_without_enc('delta', deltax, deltay))
|
|
end
|
|
|
|
#def fraction(x=None, y=None)
|
|
def fraction(x, y)
|
|
number(tk_send_without_enc('fraction', x, y))
|
|
end
|
|
|
|
def identify(x, y)
|
|
tk_send_without_enc('identify', x, y)
|
|
end
|
|
|
|
def get
|
|
#ary1 = tk_send('get').split
|
|
#ary2 = []
|
|
#for i in ary1
|
|
# ary2.push number(i)
|
|
#end
|
|
#ary2
|
|
list(tk_send_without_enc('get'))
|
|
end
|
|
|
|
def set(first, last)
|
|
tk_send_without_enc('set', first, last)
|
|
self
|
|
end
|
|
|
|
def activate(element=None)
|
|
tk_send_without_enc('activate', element)
|
|
end
|
|
|
|
def moveto(fraction)
|
|
tk_send_without_enc('moveto', fraction)
|
|
self
|
|
end
|
|
|
|
def scroll(*args)
|
|
tk_send_without_enc('scroll', *args)
|
|
self
|
|
end
|
|
|
|
def scroll_units(num)
|
|
scroll(num, 'units')
|
|
self
|
|
end
|
|
|
|
def scroll_pages(num)
|
|
scroll(num, 'pages')
|
|
self
|
|
end
|
|
end
|
|
|
|
#TkScrollbar = Tk::Scrollbar unless Object.const_defined? :TkScrollbar
|
|
Tk.__set_toplevel_aliases__(:Tk, Tk::Scrollbar, :TkScrollbar)
|
|
|
|
|
|
class Tk::XScrollbar<Tk::Scrollbar
|
|
def create_self(keys)
|
|
keys = {} unless keys
|
|
keys['orient'] = 'horizontal'
|
|
super(keys)
|
|
end
|
|
private :create_self
|
|
end
|
|
|
|
#TkXScrollbar = Tk::XScrollbar unless Object.const_defined? :TkXScrollbar
|
|
Tk.__set_toplevel_aliases__(:Tk, Tk::XScrollbar, :TkXScrollbar)
|
|
|
|
|
|
class Tk::YScrollbar<Tk::Scrollbar
|
|
def create_self(keys)
|
|
keys = {} unless keys
|
|
keys['orient'] = 'vertical'
|
|
super(keys)
|
|
end
|
|
private :create_self
|
|
end
|
|
|
|
#TkYScrollbar = Tk::YScrollbar unless Object.const_defined? :TkYScrollbar
|
|
Tk.__set_toplevel_aliases__(:Tk, Tk::YScrollbar, :TkYScrollbar)
|