diff options
author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-16 14:34:09 +0000 |
---|---|---|
committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-16 14:34:09 +0000 |
commit | 31060fb11be83c8d8c38fa1c2b8f0f7bc10cac9c (patch) | |
tree | 6e3230ad9f59930f517e296e2eefd6a76be31f96 /ext/tk/lib/tk.rb | |
parent | 6d7ddc3b297bfe6ca9f091c0097722b0422cc7e2 (diff) |
* ext/tk/extconf.rb,ext/tk/config_list.in: ignore paths which includes
white space characters on Windows.[ruby-dev:38794]
* ext/tk/lib/tk.rb: works on Cygwin (limitation:: Tk.mainloop works on
the main thread only).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/lib/tk.rb')
-rw-r--r-- | ext/tk/lib/tk.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index b071bf5be8..eddc9f0b47 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -1178,7 +1178,10 @@ module TkCore if WITH_RUBY_VM ### check Ruby 1.9 !!!!!!! # *** NEED TO FIX *** ip = TclTkIp.new(name, opts) - if ip._invoke_without_enc('tk', 'windowingsystem') == 'aqua' && + if RUBY_PLATFORM =~ /cygwin/ + RUN_EVENTLOOP_ON_MAIN_THREAD = true + INTERP = ip + elsif ip._invoke_without_enc('tk', 'windowingsystem') == 'aqua' && (TclTkLib.get_version<=>[8,4,TclTkLib::RELEASE_TYPE::FINAL,6]) > 0 # *** KNOWN BUG *** # Main event loop thread of TkAqua (> Tk8.4.9) must be the main @@ -5636,7 +5639,7 @@ TkWidget = TkWindow #Tk.freeze module Tk - RELEASE_DATE = '2009-07-12'.freeze + RELEASE_DATE = '2009-07-16'.freeze autoload :AUTO_PATH, 'tk/variable' autoload :TCL_PACKAGE_PATH, 'tk/variable' |