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
87 lines
2.4 KiB
Ruby
87 lines
2.4 KiB
Ruby
# clrpick.rb
|
|
#
|
|
# This demonstration script prompts the user to select a color.
|
|
#
|
|
# widget demo prompts the user to select a color (called by 'widget')
|
|
#
|
|
# Note: don't support ttk_wrapper. work with standard widgets only.
|
|
#
|
|
|
|
# toplevel widget
|
|
if defined?($clrpick_demo) && $clrpick_demo
|
|
$clrpick_demo.destroy
|
|
$clrpick_demo = nil
|
|
end
|
|
|
|
# demo toplevel widget
|
|
$clrpick_demo = TkToplevel.new {|w|
|
|
title("Color Selection Dialogs")
|
|
iconname("colors")
|
|
positionWindow(w)
|
|
}
|
|
|
|
base_frame = TkFrame.new($clrpick_demo).pack(:fill=>:both, :expand=>true)
|
|
|
|
# label
|
|
#TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
|
|
Tk::Label.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
|
|
'text'=>"Press the buttons below to choose the foreground and background colors for the widgets in this window.").pack('side'=>'top')
|
|
|
|
# frame
|
|
#TkFrame.new($clrpick_demo) {|frame|
|
|
Tk::Frame.new($clrpick_demo) {|frame|
|
|
# TkButton.new(frame) {
|
|
Tk::Button.new(frame) {
|
|
text 'Dismiss'
|
|
command proc{
|
|
tmppath = $clrpick_demo
|
|
$clrpick_demo = nil
|
|
tmppath.destroy
|
|
}
|
|
}.pack('side'=>'left', 'expand'=>'yes')
|
|
|
|
# TkButton.new(frame) {
|
|
Tk::Button.new(frame) {
|
|
text 'Show Code'
|
|
command proc{showCode 'clrpick'}
|
|
}.pack('side'=>'left', 'expand'=>'yes')
|
|
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
|
|
|
|
# button
|
|
# TkButton.new($clrpick_demo, 'text'=>'Set background color ...') {|b|
|
|
Tk::Button.new($clrpick_demo, 'text'=>'Set background color ...') {|b|
|
|
command(proc{setColor $clrpick_demo, b, 'background',
|
|
['background', 'highlightbackground']})
|
|
pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
|
|
}
|
|
|
|
# TkButton.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
|
|
Tk::Button.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
|
|
command(proc{setColor $clrpick_demo, b, 'foreground', ['foreground']})
|
|
pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
|
|
}
|
|
|
|
def setColor(w,button,name,options)
|
|
w.grab
|
|
initialColor = button[name]
|
|
color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w,
|
|
'initialcolor'=>initialColor)
|
|
if color != ""
|
|
setColor_helper(w,options,color)
|
|
end
|
|
|
|
w.grab('release')
|
|
end
|
|
|
|
def setColor_helper(w, options, color)
|
|
options.each{|opt|
|
|
begin
|
|
w[opt] = color
|
|
rescue
|
|
end
|
|
}
|
|
TkWinfo.children(w).each{|child|
|
|
setColor_helper child, options, color
|
|
}
|
|
end
|
|
|