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
110 lines
3.6 KiB
Ruby
110 lines
3.6 KiB
Ruby
# -*- coding: euc-jp -*-
|
||
#
|
||
# checkbutton widget demo2 (called by 'widget')
|
||
#
|
||
|
||
# toplevel widget が存在すれば削除する
|
||
if defined?($check2_demo) && $check2_demo
|
||
$check2_demo.destroy
|
||
$check2_demo = nil
|
||
end
|
||
|
||
# demo 用の toplevel widget を生成
|
||
$check2_demo = TkToplevel.new {|w|
|
||
title("Checkbutton Demonstration 2")
|
||
iconname("check2")
|
||
positionWindow(w)
|
||
}
|
||
|
||
base_frame = TkFrame.new($check2_demo).pack(:fill=>:both, :expand=>true)
|
||
|
||
# label 生成
|
||
msg = TkLabel.new(base_frame) {
|
||
font $font
|
||
wraplength '4i'
|
||
justify 'left'
|
||
text "下には4つのチェックボタンが表示されています。クリックするとボタンの選択状態が変わり、Tcl変数(TkVariableオブジェクトでアクセスできます)にそのボタンの状態を示す値を設定します。最初のボタンの状態は他の3つのボタンの状態にも依存して変化します。もし3つのボタンの一部だけにチェックが付けられている場合、最初のボタンはトライステート(3状態)モードでの表示を行います。現在の変数の値を見るには「変数参照」ボタンをクリックしてください。"
|
||
}
|
||
msg.pack('side'=>'top')
|
||
|
||
# 変数生成
|
||
safety = TkVariable.new(0)
|
||
wipers = TkVariable.new(0)
|
||
brakes = TkVariable.new(0)
|
||
sober = TkVariable.new(0)
|
||
|
||
# frame 生成
|
||
TkFrame.new(base_frame) {|frame|
|
||
TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
|
||
:columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
|
||
TkGrid('x',
|
||
TkButton.new(frame, :text=>'変数参照',
|
||
:image=>$image['view'], :compound=>:left,
|
||
:command=>proc{
|
||
showVars($check2_demo,
|
||
['safety', safety], ['wipers', wipers],
|
||
['brakes', brakes], ['sober', sober])
|
||
}),
|
||
TkButton.new(frame, :text=>'コード参照',
|
||
:image=>$image['view'], :compound=>:left,
|
||
:command=>proc{showCode 'check2'}),
|
||
TkButton.new(frame, :text=>'閉じる',
|
||
:image=>$image['delete'], :compound=>:left,
|
||
:command=>proc{
|
||
tmppath = $check2_demo
|
||
$check2_demo = nil
|
||
$showVarsWin[tmppath.path] = nil
|
||
tmppath.destroy
|
||
}),
|
||
:padx=>4, :pady=>4)
|
||
frame.grid_columnconfigure(0, :weight=>1)
|
||
}.pack('side'=>'bottom', 'fill'=>'x')
|
||
|
||
|
||
# checkbutton 生成
|
||
TkCheckButton.new(base_frame, :text=>'安全性検査', :variable=>safety,
|
||
:relief=>:flat, :onvalue=>'all', :offvalue=>'none',
|
||
:tristatevalue=>'partial'){
|
||
pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
|
||
}
|
||
|
||
[ TkCheckButton.new(base_frame, 'text'=>'ワイパー OK', 'variable'=>wipers),
|
||
TkCheckButton.new(base_frame, 'text'=>'ブレーキ OK', 'variable'=>brakes),
|
||
TkCheckButton.new(base_frame, 'text'=>'運転手 素面', 'variable'=>sober)
|
||
].each{|w|
|
||
w.relief('flat')
|
||
w.pack('side'=>'top', 'padx'=>15, 'pady'=>2, 'anchor'=>'w')
|
||
}
|
||
|
||
# tristate check
|
||
in_check = false
|
||
tristate_check = proc{|n1,n2,op|
|
||
unless in_check
|
||
in_check = true
|
||
begin
|
||
if n1 == safety
|
||
if safety == 'none'
|
||
wipers.value = 0
|
||
brakes.value = 0
|
||
sober.value = 0
|
||
elsif safety == 'all'
|
||
wipers.value = 1
|
||
brakes.value = 1
|
||
sober.value = 1
|
||
end
|
||
else
|
||
if wipers == 1 && brakes == 1 && sober == 1
|
||
safety.value = 'all'
|
||
elsif wipers == 1 || brakes == 1 || sober == 1
|
||
safety.value = 'partial'
|
||
else
|
||
safety.value = 'none'
|
||
end
|
||
end
|
||
ensure
|
||
in_check = false
|
||
end
|
||
end
|
||
}
|
||
|
||
[wipers, brakes, sober, safety].each{|v| v.trace('w', tristate_check)}
|