mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/tk/extconf.rb: New strategy for searching Tcl/Tk libraries.
* ext/tk/*: Support new features of Tcl/Tk8.6b1 and minor bug fixes. ( [KNOWN BUG] Ruby/Tk on Ruby 1.9 will not work on Cygwin. ) * ext/tk/*: Unify sources between Ruby 1.8 & 1.9. Improve default_widget_set handling. * ext/tk/*: Multi-TkInterpreter (multi-tk.rb) works on Ruby 1.8 & 1.9. ( [KNOWN BUG] On Ruby 1.8, join to a long term Thread on Tk callbacks may freeze. On Ruby 1.9, cannot create a second master interpreter (creating slaves are OK); supported master interpreter is the default master interpreter only. ) * ext/tk/lib/tkextlib/*: Update supported versions of Tk extensions. Tcllib 1.8/Tklib 0.4.1 ==> Tcllib 1.11.1/Tklib 0.5 BWidgets 1.7 ==> BWidgets 1.8 TkTable 2.9 ==> TkTable 2.10 TkTreeCtrl 2005-12-02 ==> TkTreeCtrl 2.2.9 Tile 0.8.0/8.5.1 ==> Tile 0.8.3/8.6b1 IncrTcl 2005-02-14 ==> IncrTcl 2008-12-15 TclX 2005-02-07 ==> TclX 2008-12-15 Trofs 0.4.3 ==> Trofs 0.4.4 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
e13fb8029b
commit
ed6ce8b43b
228 changed files with 7275 additions and 1058 deletions
|
@ -11,13 +11,16 @@ TkFrame.new(:borderwidth=>2, :height=>3,
|
|||
:relief=>:sunken).pack(:fill=>:x, :expand=>true,
|
||||
:padx=>10, :pady=>7)
|
||||
|
||||
safe0_p = proc{|*args| p args}
|
||||
|
||||
###############################
|
||||
|
||||
puts "---- create a safe slave IP with Ruby's safe-level == 1 ----------"
|
||||
ip = MultiTkIp.new_safe_slave(1)
|
||||
ip = MultiTkIp.new_safe_slave(1){|*args| safe0_p["safe_slave safe_level == #{$SAFE}", args]}
|
||||
|
||||
puts "\n---- create procs ----------"
|
||||
puts 'x = proc{p [\'proc x\', "$SAFE==#{$SAFE}"]; exit}'
|
||||
#x = proc{p ['proc x', "$SAFE==#{$SAFE}"]; exit}
|
||||
x = proc{p ['proc x', "$SAFE==#{$SAFE}"]; exit}
|
||||
TkLabel.new(:text=>'x = proc{p [\'proc x\', "$SAFE==#{$SAFE}"]; exit}',
|
||||
:anchor=>:w).pack(:fill=>:x)
|
||||
|
@ -46,7 +49,9 @@ p lbl = ip.eval_proc{
|
|||
:command=>proc{l.text($SAFE)}).pack(:fill=>:x, :padx=>5)
|
||||
TkButton.new(:text=>':command=>x', :command=>x).pack(:fill=>:x, :padx=>5)
|
||||
TkButton.new(:text=>':command=>proc{exit}',
|
||||
:command=>proc{exit}).pack(:fill=>:x, :padx=>5)
|
||||
:command=>proc{
|
||||
safe0_p["'exit' is called at $SAFE=#{$SAFE}"];exit}
|
||||
).pack(:fill=>:x, :padx=>5)
|
||||
TkFrame.new(:borderwidth=>2, :height=>3,
|
||||
:relief=>:sunken).pack(:fill=>:x, :expand=>true,
|
||||
:padx=>10, :pady=>7)
|
||||
|
@ -68,10 +73,24 @@ p ip.eval_proc(proc{
|
|||
TkButton.new(:text=>':command=>proc{y.call(l)}',
|
||||
:command=>proc{y.call(l)}).pack(:fill=>:x,
|
||||
:padx=>5)
|
||||
TkButton.new(:text=>':command=>proc{Proc.new(&y).call(l)}',
|
||||
:command=>proc{
|
||||
Proc.new(&y).call(l)
|
||||
}).pack(:fill=>:x, :padx=>5)
|
||||
TkButton.new(:text=>':command=>proc{MultiTkIp._proc_on_current_safelevel(y).call(l)}',
|
||||
:command=>proc{
|
||||
MultiTkIp._proc_on_current_safelevel(y).call(l)
|
||||
}).pack(:fill=>:x, :padx=>5)
|
||||
if Object.const_defined?(:RubyVM) && ::RubyVM.class == Class
|
||||
TkButton.new(:text=>':command=>proc{Thread.new(l, &y).value}',
|
||||
:command=>proc{
|
||||
Thread.new(l, &y).value
|
||||
}).pack(:fill=>:x, :padx=>5)
|
||||
else
|
||||
# KNOWN BUG::
|
||||
# Current multi-tk.rb cannot support long term threads on callbacks.
|
||||
# Such a thread freezes the Ruby/Tk process.
|
||||
end
|
||||
TkButton.new(:text=>':command=>proc{z.call}',
|
||||
:command=>proc{z.call}).pack(:fill=>:x, :padx=>5)
|
||||
TkFrame.new(:borderwidth=>2, :height=>3,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue