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
85 lines
3.3 KiB
Ruby
85 lines
3.3 KiB
Ruby
# ttkmenu.rb --
|
|
#
|
|
# This demonstration script creates a toplevel window containing several Ttk
|
|
# menubutton widgets.
|
|
#
|
|
# based on "Id: ttkmenu.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
|
|
|
|
if defined?($ttkmenu_demo) && $ttkmenu_demo
|
|
$ttkmenu_demo.destroy
|
|
$ttkmenu_demo = nil
|
|
end
|
|
|
|
$ttkmenu_demo = TkToplevel.new {|w|
|
|
title("Ttk Menu Buttons")
|
|
iconname("ttkmenu")
|
|
positionWindow(w)
|
|
}
|
|
|
|
base_frame = Ttk::Frame.new($ttkmenu_demo).pack(:fill=>:both, :expand=>true)
|
|
|
|
Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
|
|
:text=><<EOL).pack(:side=>:top, :fill=>:x)
|
|
Ttk is the new Tk themed widget set, \
|
|
and one widget that is available in themed form is the menubutton. \
|
|
Below are some themed menu buttons \
|
|
that allow you to pick the current theme in use. \
|
|
Notice how picking a theme changes the way \
|
|
that the menu buttons themselves look, \
|
|
and that the central menu button is styled differently \
|
|
(in a way that is normally suitable for toolbars). \
|
|
However, there are no themed menus; the standard Tk menus were judged \
|
|
to have a sufficiently good look-and-feel on all platforms, \
|
|
especially as they are implemented as native controls in many places.
|
|
EOL
|
|
|
|
Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
|
|
|
|
## See Code / Dismiss
|
|
Ttk::Frame.new($ttkmenu_demo) {|frame|
|
|
sep = Ttk::Separator.new(frame)
|
|
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
|
|
TkGrid('x',
|
|
Ttk::Button.new(frame, :text=>'See Code',
|
|
:image=>$image['view'], :compound=>:left,
|
|
:command=>proc{showCode 'ttkmenu'}),
|
|
Ttk::Button.new(frame, :text=>'Dismiss',
|
|
:image=>$image['delete'], :compound=>:left,
|
|
:command=>proc{
|
|
$ttkmenu_demo.destroy
|
|
$ttkmenu_demo = nil
|
|
}),
|
|
:padx=>4, :pady=>4)
|
|
grid_columnconfigure(0, :weight=>1)
|
|
pack(:side=>:bottom, :fill=>:x)
|
|
}
|
|
|
|
b1 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:above)
|
|
b2 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:left)
|
|
b3 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:right)
|
|
b4 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:flush,
|
|
:style=>Ttk::Menubutton.style('Toolbutton'))
|
|
b5 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:below)
|
|
|
|
b1.menu(m1 = Tk::Menu.new(b1, :tearoff=>false))
|
|
b2.menu(m2 = Tk::Menu.new(b2, :tearoff=>false))
|
|
b3.menu(m3 = Tk::Menu.new(b3, :tearoff=>false))
|
|
b4.menu(m4 = Tk::Menu.new(b4, :tearoff=>false))
|
|
b5.menu(m5 = Tk::Menu.new(b5, :tearoff=>false))
|
|
|
|
Ttk.themes.each{|theme|
|
|
m1.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
|
|
m2.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
|
|
m3.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
|
|
m4.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
|
|
m5.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
|
|
}
|
|
|
|
f = Ttk::Frame.new(base_frame).pack(:fill=>:x)
|
|
f1 = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
|
|
f.lower
|
|
|
|
f.grid_anchor(:center)
|
|
TkGrid('x', b1, 'x', :in=>f, :padx=>3, :pady=>2)
|
|
TkGrid(b2, b4, b3, :in=>f, :padx=>3, :pady=>2)
|
|
TkGrid('x', b5, 'x', :in=>f, :padx=>3, :pady=>2)
|