From a61ea1af99fafbf063b0c5b2784f4d07574eb8ed Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 17 Jul 2003 05:23:54 +0000
Subject: * eval.c (ruby_init): set ruby_running to true after  
 initialization.

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

(limited to 'ext')

diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index b9280e290..22489dc1b 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -324,7 +324,7 @@ module TkComm
     return '' if cmd == ''
     id = _next_cmd_id
     Tk_CMDTBL[id] = cmd
-    @cmdtbl = [] unless @cmdtbl
+    @cmdtbl = [] unless defined? @cmdtbl
     @cmdtbl.push id
     return format("rb_out %s", id);
   end
@@ -859,10 +859,6 @@ module TkCore
     tk_call 'tk_getSaveFile', *hash_kv(keys)
   end
 
-  def chooseDirectory(keys = nil)
-    tk_call 'tk_chooseDIrectory', *hash_kv(keys)
-  end
-
   def chooseColor(keys = nil)
     tk_call 'tk_chooseColor', *hash_kv(keys)
   end
@@ -1385,7 +1381,7 @@ if /^8\.[1-9]/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK
     attr_accessor :encoding
     
     def _eval(cmd)
-      if @encoding
+      if defined? @encoding
 	_fromUTF8(__eval(_toUTF8(cmd, @encoding)), @encoding)
       else
 	__eval(cmd)
@@ -1393,7 +1389,7 @@ if /^8\.[1-9]/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK
     end
     
     def _invoke(*cmds)
-      if @encoding
+      if defined? @encoding
 	cmds = cmds.collect{|cmd| _toUTF8(cmd, @encoding)}
 	_fromUTF8(__invoke(*cmds), @encoding)
       else
@@ -1505,8 +1501,6 @@ class TkBindTag
     }
   end
 
-  ALL = self.new_by_name('all')
-
   def initialize(*args, &b)
     @id = Tk_BINDTAG_ID[0]
     Tk_BINDTAG_ID[0] = Tk_BINDTAG_ID[0].succ
@@ -1514,6 +1508,8 @@ class TkBindTag
     bind(*args, &b) if args != []
   end
 
+  ALL = self.new_by_name('all')
+
   def name
     @id
   end
-- 
cgit