diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-02 16:25:09 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-02 16:25:09 +0000 |
| commit | 90dafe61fc97563d0b2fe573ca21fab4d8dc51af (patch) | |
| tree | 3dbb5c18ece6150599311029382648c82db57917 | |
| parent | 8978d52ac849e6da932e155678c1fd335789cec3 (diff) | |
* ext/tk/lib/tk.rb: fix typo and race condition.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/tk/lib/tk.rb | 13 |
2 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Thu Jun 3 01:22:45 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * ext/tk/lib/tk.rb: fix typo and race condition. + Mon May 31 23:44:22 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/extconf.rb: use tclConfig.sh/tkConfig.sh when frameworks diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index 927cf18063..4beaaf932a 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -1229,7 +1229,8 @@ module TkCore INTERP_ROOT_CHECK = ConditionVariable.new INTERP_THREAD = Thread.new{ begin - Thread.current[:interp] = interp = TclTkIp.new(name, opts) + #Thread.current[:interp] = interp = TclTkIp.new(name, opts) + interp = TclTkIp.new(name, opts) rescue => e Thread.current[:interp] = e raise e @@ -1248,13 +1249,15 @@ module TkCore # like as 1.8, withdraw a root widget before calling Tk.mainloop interp._eval <<EOS +wm withdraw . rename wm __wm_orig__ proc wm {subcmd win args} { - eval [list __wm_orig__ $subcmd $win] $args + set val [eval [list __wm_orig__ $subcmd $win] $args] if {[string equal $subcmd withdraw] && [string equal $win .]} { rename wm {} rename __wm_orig__ wm } + return $val } proc __startup_rbtk_mainloop__ {args} { rename __startup_rbtk_mainloop__ {} @@ -1275,6 +1278,7 @@ EOS #TclTkLib.mainloop_abort_on_exception = false #Thread.current[:status].value = TclTkLib.mainloop(true) interp.mainloop_abort_on_exception = true + Thread.current[:interp] = interp Thread.current[:status].value = interp.mainloop(true) rescue SystemExit=>e Thread.current[:status].value = e @@ -1836,7 +1840,8 @@ EOS end # like as 1.8, withdraw a root widget before calling Tk.mainloop - TkCore::INTERP._eval_without_enc('unset __initail_state_of_rubytk__') + TkCore::INTERP._eval_without_enc('catch {unset __initial_state_of_rubytk__}') + INTERP_THREAD.run begin TclTkLib.set_eventloop_window_mode(true) @@ -5693,7 +5698,7 @@ TkWidget = TkWindow #Tk.freeze module Tk - RELEASE_DATE = '2010-05-31'.freeze + RELEASE_DATE = '2010-06-03'.freeze autoload :AUTO_PATH, 'tk/variable' autoload :TCL_PACKAGE_PATH, 'tk/variable' |