From e36f128f09cec6b0feab6adabc57d72f8ed5ccba Mon Sep 17 00:00:00 2001 From: nagai Date: Fri, 17 Sep 2004 06:05:33 +0000 Subject: * ext/tcltklib/tcltklib.c: fix SEGV when (thread_)vwait or (thread_)tkwait * ext/tk/lib/tk.rb: add alias wait_window to wait_destroy * ext/tk/lib/multi-tk.rb: support calling 'mainloop' on slave interpreters (however, the 'real' eventloop must be run on the Default Master IP) * ext/tk/lib/remote-tk.rb: follow the changes of ext/tk/lib/multi-tk.rb * ext/tk/sample/remote-ip_sample2.rb: ditto * ext/tk/sample/tkoptdb-safeTk.rb: ditto git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6916 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/tk/lib/remote-tk.rb | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'ext/tk/lib/remote-tk.rb') diff --git a/ext/tk/lib/remote-tk.rb b/ext/tk/lib/remote-tk.rb index d09b2289e..77dbacfb1 100644 --- a/ext/tk/lib/remote-tk.rb +++ b/ext/tk/lib/remote-tk.rb @@ -96,6 +96,8 @@ class RemoteTkIp @safe_level = [$SAFE] + @wait_on_mainloop = [true, false] + @cmd_queue = Queue.new =begin @@ -403,6 +405,12 @@ class RemoteTkIp def do_one_evant(flag = nil) fail RuntimeError, 'not support "do_one_event" on the remote interpreter' end + def mainloop_abort_on_exception + fail RuntimeError, 'not support "mainloop_abort_on_exception" on the remote interpreter' + end + def mainloop_abort_on_exception=(mode) + fail RuntimeError, 'not support "mainloop_abort_on_exception=" on the remote interpreter' + end def set_eventloop_tick(*args) fail RuntimeError, 'not support "set_eventloop_tick" on the remote interpreter' end @@ -421,24 +429,24 @@ class RemoteTkIp def get_eventloop_weight fail RuntimeError, 'not support "get_eventloop_weight" on the remote interpreter' end - def mainloop_abort_on_exception - fail RuntimeError, 'not support "mainloop_abort_on_exception" on the remote interpreter' - end - def mainloop_abort_on_exception=(*args) - fail RuntimeError, 'not support "mainloop_abort_on_exception=" on the remote interpreter' - end end class << RemoteTkIp - def mainloop + def mainloop(*args) fail RuntimeError, 'not support "mainloop" on the remote interpreter' end - def mainloop_watchdog + def mainloop_watchdog(*args) fail RuntimeError, 'not support "mainloop_watchdog" on the remote interpreter' end def do_one_evant(flag = nil) fail RuntimeError, 'not support "do_one_event" on the remote interpreter' end + def mainloop_abort_on_exception + fail RuntimeError, 'not support "mainloop_abort_on_exception" on the remote interpreter' + end + def mainloop_abort_on_exception=(mode) + fail RuntimeError, 'not support "mainloop_abort_on_exception=" on the remote interpreter' + end def set_eventloop_tick(*args) fail RuntimeError, 'not support "set_eventloop_tick" on the remote interpreter' end @@ -457,10 +465,4 @@ class << RemoteTkIp def get_eventloop_weight fail RuntimeError, 'not support "get_eventloop_weight" on the remote interpreter' end - def mainloop_abort_on_exception - fail RuntimeError, 'not support "mainloop_abort_on_exception" on the remote interpreter' - end - def mainloop_abort_on_exception=(*args) - fail RuntimeError, 'not support "mainloop_abort_on_exception=" on the remote interpreter' - end end -- cgit