mirror of
https://github.com/ruby/ruby.git
synced 2025-09-18 01:54:00 +02:00
* ext/tk/tkutil/tkutil.c: fix SEGV on TkUtil::CallbackSubst._setup_subst_table.
* ext/tk/lib/tk.rb: [POTENTIAL INCOMPATIBLE] return NoMethodError for TkWindow#to_ary and to_str. * ext/tk/lib/tkextlib/tcllib/plotchart.rb: wrong arguments. * ext/tk/sampel/tkballoonhelp.rb: fail to support TkEntry widgets. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@26532 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
c0497c5b43
commit
36f70bd423
5 changed files with 49 additions and 16 deletions
|
@ -1174,6 +1174,8 @@ module TkCore
|
|||
opts = ''
|
||||
end
|
||||
|
||||
# RUN_EVENTLOOP_ON_MAIN_THREAD = true
|
||||
|
||||
unless self.const_defined? :RUN_EVENTLOOP_ON_MAIN_THREAD
|
||||
if WITH_RUBY_VM ### check Ruby 1.9 !!!!!!!
|
||||
# *** NEED TO FIX ***
|
||||
|
@ -1275,6 +1277,14 @@ module TkCore
|
|||
|
||||
INTERP = INTERP_THREAD[:interp]
|
||||
INTERP_THREAD_STATUS = INTERP_THREAD[:status]
|
||||
|
||||
# delete the interpreter and kill the eventloop thread at exit
|
||||
END{
|
||||
if INTERP_THREAD.alive?
|
||||
INTERP.delete
|
||||
INTERP_THREAD.kill
|
||||
end
|
||||
}
|
||||
end
|
||||
|
||||
def INTERP.__getip
|
||||
|
@ -4890,7 +4900,7 @@ class TkObject<TkKernel
|
|||
begin
|
||||
cget(name)
|
||||
rescue
|
||||
if self.kind_of?(TkWindow)
|
||||
if self.kind_of?(TkWindow) && name != "to_ary" && name != "to_str"
|
||||
fail NameError,
|
||||
"unknown option '#{id}' for #{self.inspect} (deleted widget?)"
|
||||
else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue