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
76 lines
2.7 KiB
Ruby
76 lines
2.7 KiB
Ruby
#
|
|
# text widget peering demo (called by 'widget')
|
|
#
|
|
# based on Tcl/Tk8.5.0 widget demos
|
|
|
|
if defined?($textpeer_demo) && $textpeer_demo
|
|
$textpeer_demo.destroy
|
|
$textpeer_demo = nil
|
|
end
|
|
|
|
# demo toplevel widget
|
|
$textpeer_demo = TkToplevel.new {|w|
|
|
title("Text Wdget Peering Demonstration")
|
|
iconname("textpeer")
|
|
positionWindow(w)
|
|
}
|
|
|
|
base_frame = TkFrame.new($textpeer_demo).pack(:fill=>:both, :expand=>true)
|
|
|
|
count = [0]
|
|
|
|
## Define a widget that we peer from; it won't ever actually be shown though
|
|
first = TkText.new(base_frame, :widgetname=>"text#{count[0] += 1}")
|
|
first.insert :end,"This is a coupled pair of text widgets; they are peers to "
|
|
first.insert :end,"each other. They have the same underlying data model, but "
|
|
first.insert :end,"can show different locations, have different current edit "
|
|
first.insert :end,"locations, and have different selections. You can also "
|
|
first.insert :end,"create additional peers of any of these text widgets using "
|
|
first.insert :end,"the Make Peer button beside the text widget to clone, and "
|
|
first.insert :end,"delete a particular peer widget using the Delete Peer "
|
|
first.insert :end,"button."
|
|
|
|
Tk.update_idletasks ## for 'first' widget
|
|
|
|
## Procedures to make and kill clones; most of this is just so that the demo
|
|
## looks nice...
|
|
def makeClone(count, win, txt)
|
|
cnt = (count[0] += 1)
|
|
peer = TkText::Peer.new(txt, win, :widgetname=>"text#{cnt}")
|
|
sbar = TkScrollbar.new(win, :widgetname=>"sb#{cnt}")
|
|
peer.yscrollbar sbar
|
|
b1 = TkButton.new(win, :widgetname=>"clone#{cnt}", :text=>'Make Peer',
|
|
:command=>proc{makeClone(count, win, peer)})
|
|
b2 = TkButton.new(win, :widgetname=>"kill#{cnt}", :text=>'Delete Peer',
|
|
:command=>proc{killClone(win, cnt)})
|
|
row = cnt * 2
|
|
TkGrid.configure(peer, sbar, b1, :sticky=>'nsew', :row=>row)
|
|
TkGrid.configure('^', '^', b2, :sticky=>'nsew', :row=>(row+=1))
|
|
TkGrid.configure(b1, b2, :sticky=>'new')
|
|
TkGrid.rowconfigure(win, b2, :weight=>1)
|
|
end
|
|
|
|
def killClone(win, cnt)
|
|
Tk.destroy("#{win.path}.text#{cnt}", "#{win.path}.sb#{cnt}",
|
|
"#{win.path}.clone#{cnt}", "#{win.path}.kill#{cnt}")
|
|
end
|
|
|
|
## Now set up the GUI
|
|
makeClone(count, base_frame, first)
|
|
makeClone(count, base_frame, first)
|
|
first.destroy
|
|
|
|
## See Code / Dismiss buttons
|
|
TkFrame.new(base_frame){|f|
|
|
TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
|
|
$textpeer_demo.destroy
|
|
$textpeer_demo = nil
|
|
}).pack(:side=>:left, :expand=>true)
|
|
|
|
TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
|
|
showCode 'textpeer'
|
|
}).pack(:side=>:left, :expand=>true)
|
|
|
|
TkGrid.configure(f, '-', '-', :sticky=>'ew', :row=>5000)
|
|
}
|
|
TkGrid.columnconfigure(base_frame, 0, :weight=>1)
|