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
174 lines
3.6 KiB
Ruby
174 lines
3.6 KiB
Ruby
#
|
|
# tkextlib/iwidgets/notebook.rb
|
|
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
|
|
#
|
|
|
|
require 'tk'
|
|
require 'tkextlib/iwidgets.rb'
|
|
|
|
module Tk
|
|
module Iwidgets
|
|
class Notebook < Tk::Itk::Widget
|
|
end
|
|
end
|
|
end
|
|
|
|
class Tk::Iwidgets::Notebook
|
|
TkCommandNames = ['::iwidgets::notebook'.freeze].freeze
|
|
WidgetClassName = 'Notebook'.freeze
|
|
WidgetClassNames[WidgetClassName] = self
|
|
|
|
####################################
|
|
|
|
include TkItemConfigMethod
|
|
|
|
def __item_cget_cmd(id)
|
|
[self.path, 'pagecget', id]
|
|
end
|
|
private :__item_cget_cmd
|
|
|
|
def __item_config_cmd(id)
|
|
[self.path, 'pageconfigure', id]
|
|
end
|
|
private :__item_config_cmd
|
|
|
|
def tagid(tagOrId)
|
|
if tagOrId.kind_of?(Tk::Itk::Component)
|
|
tagOrId.name
|
|
else
|
|
#_get_eval_string(tagOrId)
|
|
tagOrId
|
|
end
|
|
end
|
|
|
|
alias pagecget itemcget
|
|
alias pagecget_strict itemcget_strict
|
|
alias pageconfigure itemconfigure
|
|
alias pageconfiginfo itemconfiginfo
|
|
alias current_pageconfiginfo current_itemconfiginfo
|
|
|
|
private :itemcget, :itemcget_strict
|
|
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
|
|
|
|
####################################
|
|
|
|
def __boolval_optkeys
|
|
super() << 'auto'
|
|
end
|
|
private :__boolval_optkeys
|
|
|
|
def add(keys={})
|
|
window(tk_call(@path, 'add', *hash_kv(keys)))
|
|
end
|
|
|
|
def child_site_list
|
|
list(tk_call(@path, 'childsite'))
|
|
end
|
|
|
|
def child_site(idx)
|
|
if (new_idx = self.index(idx)) < 0
|
|
new_idx = tagid(idx)
|
|
end
|
|
window(tk_call(@path, 'childsite', new_idx))
|
|
end
|
|
|
|
def delete(idx1, idx2=nil)
|
|
if (new_idx1 = self.index(idx1)) < 0
|
|
new_idx1 = tagid(idx1)
|
|
end
|
|
if idx2
|
|
if (new_idx2 = self.index(idx2)) < 0
|
|
new_idx2 = tagid(idx2)
|
|
end
|
|
tk_call(@path, 'delete', new_idx1, new_idx2)
|
|
else
|
|
tk_call(@path, 'delete', new_idx1)
|
|
end
|
|
self
|
|
end
|
|
|
|
def index(idx)
|
|
number(tk_call(@path, 'index', tagid(idx)))
|
|
end
|
|
|
|
def insert(idx, keys={})
|
|
if (new_idx = self.index(idx)) < 0
|
|
new_idx = tagid(idx)
|
|
end
|
|
window(tk_call(@path, 'insert', new_idx, *hash_kv(keys)))
|
|
end
|
|
|
|
def next
|
|
tk_call(@path, 'next')
|
|
self
|
|
end
|
|
|
|
def prev
|
|
tk_call(@path, 'prev')
|
|
self
|
|
end
|
|
|
|
def select(idx)
|
|
if (new_idx = self.index(idx)) < 0
|
|
new_idx = tagid(idx)
|
|
end
|
|
tk_call(@path, 'select', new_idx)
|
|
self
|
|
end
|
|
|
|
def scrollcommand(cmd=Proc.new)
|
|
configure_cmd 'scrollcommand', cmd
|
|
self
|
|
end
|
|
alias xscrollcommand scrollcommand
|
|
alias yscrollcommand scrollcommand
|
|
|
|
def xscrollbar(bar=nil)
|
|
if bar
|
|
@scrollbar = bar
|
|
@scrollbar.orient 'horizontal'
|
|
self.scrollcommand {|*arg| @scrollbar.set(*arg)}
|
|
@scrollbar.command {|*arg| self.xview(*arg)}
|
|
Tk.update # avoid scrollbar trouble
|
|
end
|
|
@scrollbar
|
|
end
|
|
def yscrollbar(bar=nil)
|
|
if bar
|
|
@scrollbar = bar
|
|
@scrollbar.orient 'vertical'
|
|
self.scrollcommand {|*arg| @scrollbar.set(*arg)}
|
|
@scrollbar.command {|*arg| self.yview(*arg)}
|
|
Tk.update # avoid scrollbar trouble
|
|
end
|
|
@scrollbar
|
|
end
|
|
alias scrollbar yscrollbar
|
|
|
|
def view(*idxs)
|
|
if idxs.size == 0
|
|
idx = num_or_str(tk_send_without_enc('view'))
|
|
if idx.kind_of?(Fixnum) && idx < 0
|
|
nil
|
|
else
|
|
idx
|
|
end
|
|
else
|
|
tk_send_without_enc('view', *idxs)
|
|
self
|
|
end
|
|
end
|
|
alias xview view
|
|
alias yview view
|
|
|
|
def view_moveto(*idxs)
|
|
view('moveto', *idxs)
|
|
end
|
|
alias xview_moveto view_moveto
|
|
alias yview_moveto view_moveto
|
|
def view_scroll(index, what='pages')
|
|
view('scroll', index, what)
|
|
end
|
|
alias xview_scroll view_scroll
|
|
alias yview_scroll view_scroll
|
|
end
|