From 1e96837fc2b3bb3ed5af2fdbde0686f06d25dbd9 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 11 Jul 2003 07:17:46 +0000
Subject: tk.rb :   * not create a Tcl/Tk interpreter if already defined
 TkCore::INTERP   * bugfix on TkWindow#configure

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/tk.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 3c399a24a..b9280e290 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -636,7 +636,7 @@ module TkCore
   include TkComm
   extend TkComm
 
-  INTERP = TclTkIp.new
+  INTERP = TclTkIp.new unless self.const_defined? :INTERP
 
   INTERP._invoke("proc", "rb_out", "args", <<-'EOL')
     regsub -all {!} $args {\\!} args
@@ -3138,7 +3138,7 @@ class TkObject<TkKernel
 	  slot['latinfont'] || slot[:latinfont] || 
           slot['asciifont'] || slot[:asciifont] )
 	font_configure(slot)
-      else
+      elsif slot.size > 0
 	tk_call path, 'configure', *hash_kv(slot)
       end
 
-- 
cgit