summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-07-29 16:20:36 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-07-29 16:20:36 +0000
commit7d1de7464b31bdd5b4e61897ef9b37e3e8d5389a (patch)
tree70da0d998bfceee6ce54a07471f33a9b237abc7e /ext
parent12d3662b3921970127c7beaaf182d45a26a7006e (diff)
* fix a bug of the procedure for 'Delete' button on the safe-Tk frmae
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4219 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/tk/lib/multi-tk.rb1
-rw-r--r--ext/tk/sample/safe-tk.rb10
2 files changed, 10 insertions, 1 deletions
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
index 48e652e..00d0182 100644
--- a/ext/tk/lib/multi-tk.rb
+++ b/ext/tk/lib/multi-tk.rb
@@ -352,7 +352,6 @@ class MultiTkIp
unless slave_ip.deleted?
if slave_ip._invoke('info', 'command', '.') != ""
slave_ip._invoke('destroy', '.')
- slave_ip.tk_windows.delete('.')
end
slave_ip.delete
end
diff --git a/ext/tk/sample/safe-tk.rb b/ext/tk/sample/safe-tk.rb
index 34e1a46..0c45ec3 100644
--- a/ext/tk/sample/safe-tk.rb
+++ b/ext/tk/sample/safe-tk.rb
@@ -49,4 +49,14 @@ safe_slave1.eval_proc(cmd, 'safe1')
safe_slave2.eval_proc(cmd, 'safe2')
cmd.call('master')
+TkTimer.new(2000, -1, proc{p ['safe1', safe_slave1.deleted?]}).start
+TkTimer.new(2000, -1, proc{p ['safe2', safe_slave2.deleted?]}).start
+TkTimer.new(2000, -1, proc{p ['trusted', trusted_slave.deleted?]}).start
+
+TkTimer.new(10000, 1,
+ proc{
+ trusted_slave.eval_proc{Tk.root.destroy}
+ trusted_slave.delete
+ }).start
+
Tk.mainloop