* ext/tk/lib/tk.rb: Tk.destroy uses TkWindow#epath

* ext/tk/lib/tk/image.rb: bug fix
* ext/tk/lib/tk/wm.rb: add 'iconphoto' method(Windows only)
* ext/tk/lib/tkextlib/*: some methods uses TkWindow#epath


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7386 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 1 deletions

diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 6fb139f015..0abab4b3ec 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -1677,7 +1677,14 @@ module Tk
   end
 
   def Tk.destroy(*wins)
-    tk_call_without_enc('destroy', *wins)
+    #tk_call_without_enc('destroy', *wins)
+    tk_call_without_enc('destroy', *(wins.collect{|win|
+                                       if win.kind_of?(TkWindow)
+                                         win.epath
+                                       else
+                                         win
+                                       end
+                                     }))
   end
 
   def Tk.exit