summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-07-11 07:17:46 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-07-11 07:17:46 +0000
commit7a89869340973e53cd2d95f11381eeaf98b16c7d (patch)
treea44abd7c1fbab973df8fb20605c0596501185fea /ext
parent538e8190bc68afcfd2f8308cb0e4c92394e93935 (diff)
tk.rb :
* not create a Tcl/Tk interpreter if already defined TkCore::INTERP * bugfix on TkWindow#configure git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/tk/lib/tk.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 3c399a24a7..b9280e2901 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