mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/tk/tcltklib.c: SEGV when tcltk-stubs is enabled.
* 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
This commit is contained in:
parent
af0c875e26
commit
e6697a6405
220 changed files with 7112 additions and 1277 deletions
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
|
||||
#
|
||||
version = '0.1'
|
||||
version = '0.1.3'
|
||||
#
|
||||
##########################################################################
|
||||
# parse commandline arguments
|
||||
|
@ -51,6 +51,15 @@ if OPTS[:verbose]
|
|||
end
|
||||
|
||||
|
||||
##########################################################################
|
||||
# define Tcl/Tk procedures for compatibility.
|
||||
# those are required when want to use themes included
|
||||
# in "sample/tkextlib/tile/demo.rb".
|
||||
##########################################################################
|
||||
Tk::Tile.__define_LoadImages_proc_for_compatibility__!
|
||||
Tk::Tile::Style.__define_wrapper_proc_for_compatibility__!
|
||||
|
||||
|
||||
##########################################################################
|
||||
# use themes defined on the demo of Ttk (Tile) extension
|
||||
##########################################################################
|
||||
|
@ -91,15 +100,6 @@ themes_by_ruby.each{|f|
|
|||
}
|
||||
|
||||
|
||||
##########################################################################
|
||||
# define Tcl/Tk procedures for compatibility.
|
||||
# those are required when want to use themes included
|
||||
# in "sample/tkextlib/tile/demo.rb".
|
||||
##########################################################################
|
||||
Tk::Tile.__define_LoadImages_proc_for_compatibility__!
|
||||
Tk::Tile::Style.__define_wrapper_proc_for_compatibility__!
|
||||
|
||||
|
||||
##########################################################################
|
||||
# ignore unsupported options of Ttk widgets
|
||||
##########################################################################
|
||||
|
@ -107,45 +107,45 @@ TkConfigMethod.__set_IGNORE_UNKNOWN_CONFIGURE_OPTION__! true
|
|||
TkItemConfigMethod.__set_IGNORE_UNKNOWN_CONFIGURE_OPTION__! true
|
||||
|
||||
|
||||
##########################################################################
|
||||
# define utility method
|
||||
##########################################################################
|
||||
def setTheme(theme)
|
||||
unless Tk::Tile::Style.theme_names.find{|n| n == theme}
|
||||
if (pkg = TkPackage.names.find{|n| n =~ /(tile|ttk)::theme::#{theme}/})
|
||||
TkPackage.require(pkg)
|
||||
end
|
||||
end
|
||||
Tk::Tile::Style.theme_use(theme)
|
||||
end
|
||||
|
||||
|
||||
##########################################################################
|
||||
# make theme name list
|
||||
##########################################################################
|
||||
ThemesList = Tk::Tile::Style.theme_names
|
||||
TkPackage.names.find_all{|n| n =~ /^(tile|ttk)::theme::/}.each{|pkg|
|
||||
ThemesList << pkg.split('::')[-1]
|
||||
}
|
||||
ThemesList.uniq!
|
||||
|
||||
|
||||
##########################################################################
|
||||
# set theme of widget style
|
||||
##########################################################################
|
||||
if OPTS[:list] || OPTS[:verbose]
|
||||
print "supported theme names: #{ThemesList.inspect}\n"
|
||||
print "supported theme names: #{Tk::Tile.themes.inspect}\n"
|
||||
exit if OPTS[:list] && ARGV.empty?
|
||||
end
|
||||
print "use theme: \"#{OPTS[:theme]}\"\n" if OPTS[:theme] && OPTS[:verbose]
|
||||
setTheme(OPTS[:theme]) if OPTS[:theme]
|
||||
#setTheme(OPTS[:theme]) if OPTS[:theme]
|
||||
Tk::Tile.set_theme(OPTS[:theme]) if OPTS[:theme]
|
||||
|
||||
|
||||
##########################################################################
|
||||
# replace $0 and $RPAGRAM_NAME
|
||||
##########################################################################
|
||||
# When the expand_path of the target script is long, ruby sometimes
|
||||
# fails to set the path to $0 (the path string is trimmed).
|
||||
# The following replaces $0 and $PROGNAME to avoid such trouble.
|
||||
progname_obj = $0.dup
|
||||
$program_name = progname_obj
|
||||
|
||||
alias $REAL_PROGRAM_NAME $0
|
||||
alias $PROGRAM_NAME $program_name
|
||||
alias $0 $program_name
|
||||
|
||||
trace_var(:$program_name){|val|
|
||||
unless progname_obj.object_id == val.object_id
|
||||
progname_obj.replace(val.to_s)
|
||||
$program_name = progname_obj
|
||||
end
|
||||
}
|
||||
|
||||
|
||||
##########################################################################
|
||||
# load script
|
||||
##########################################################################
|
||||
if (script = File.expand_path(ARGV.shift))
|
||||
if (path = ARGV.shift) && (script = File.expand_path(path))
|
||||
print "load script \"#{script}\"\n" if OPTS[:verbose]
|
||||
$0 = script
|
||||
load(script)
|
||||
else
|
||||
print "Error: no script is given.\n"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue