tk 0.1.0 → 0.4.0

data/lib/tk/autoload.rb

@@ -452,7 +452,7 @@ class << Tk
 
     reg = /^#{Regexp.quote(auto)}(\.rb|\.so|)$/
     @TOPLEVEL_ALIAS_TABLE.each_key{|set|
-      if @TOPLEVEL_ALIAS_TABLE[set][sym] =~ reg
+      if reg =~ @TOPLEVEL_ALIAS_TABLE[set][sym].to_s
         @TOPLEVEL_ALIAS_TABLE[set][sym] = obj
         if @TOPLEVEL_ALIAS_OWNER[sym].nil? || @TOPLEVEL_ALIAS_OWNER[sym] == set
           replace_topalias(sym, obj)
@@ -460,10 +460,10 @@ class << Tk
         end
       end
     }
-    if (f = Object.autoload?(sym)) && f =~ reg
+    if (f = Object.autoload?(sym)) && reg =~ f.to_s
       replace_topobj(sym, obj)
     end
-    if (f = Tk::TOPLEVEL_ALIASES.autoload?(sym)) && f =~ reg
+    if (f = Tk::TOPLEVEL_ALIASES.autoload?(sym)) && reg =~ f.to_s
       replace_topalias(sym, obj)
     end
   end

data/lib/tk/bgerror.rb

@@ -17,8 +17,8 @@ module TkBgError
   alias show bgerror
   module_function :bgerror, :tkerror, :show
 
-  def set_handler(hdlr = Proc.new) #==> handler :: proc{|msg| ...body... }
-    tk_call('proc', 'bgerror', 'msg', install_cmd(hdlr) + ' $msg')
+  def set_handler(hdlr = nil, &block) #==> handler :: proc{|msg| ...body... }
+    tk_call('proc', 'bgerror', 'msg', install_cmd(hdlr || block) + ' $msg')
   end
   def set_default
     begin

data/lib/tk/bindtag.rb

@@ -10,7 +10,7 @@ class TkBindTag
   #BTagID_TBL = {}
   BTagID_TBL = TkCore::INTERP.create_table
 
-  (Tk_BINDTAG_ID = ["btag".freeze, TkUtil.untrust("00000")]).instance_eval{
+  (Tk_BINDTAG_ID = ["btag".freeze, "00000"]).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze

data/lib/tk/canvas.rb

@@ -131,31 +131,23 @@ class Tk::Canvas<TkWindow
                              *tags.collect{|t| tagid(t)}))
   end
 
-  #def itembind(tag, context, cmd=Proc.new, *args)
-  #  _bind([path, "bind", tagid(tag)], context, cmd, *args)
-  #  self
-  #end
-  def itembind(tag, context, *args)
+  def itembind(tag, context, *args, &block)
     # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
+    if TkComm._callback_entry?(args[0]) || !block
       cmd = args.shift
     else
-      cmd = Proc.new
+      cmd = block
     end
     _bind([path, "bind", tagid(tag)], context, cmd, *args)
     self
   end
 
-  #def itembind_append(tag, context, cmd=Proc.new, *args)
-  #  _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
-  #  self
-  #end
-  def itembind_append(tag, context, *args)
+  def itembind_append(tag, context, *args, &block)
     # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
+    if TkComm._callback_entry?(args[0]) || !block
       cmd = args.shift
     else
-      cmd = Proc.new
+      cmd = block
     end
     _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
     self
@@ -566,7 +558,7 @@ class Tk::Canvas<TkWindow
 
   def rchars(tag, first, last, str_or_coords)
     # Tcl/Tk 8.6 or later
-    str_or_coords = str_or_coords.flatten if str_or_coords.kinad_of? Array
+    str_or_coords = str_or_coords.flatten if str_or_coords.kind_of? Array
     tk_send_without_enc('rchars', tagid(tag), first, last, str_or_coords)
     self
   end

data/lib/tk/canvastag.rb

@@ -22,31 +22,23 @@ module TkcTagAccess
     @c.bbox(@id)
   end
 
-  #def bind(seq, cmd=Proc.new, *args)
-  #  @c.itembind(@id, seq, cmd, *args)
-  #  self
-  #end
-  def bind(seq, *args)
+  def bind(seq, *args, &block)
     # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
+    if TkComm._callback_entry?(args[0]) || !block
       cmd = args.shift
     else
-      cmd = Proc.new
+      cmd = block
     end
     @c.itembind(@id, seq, cmd, *args)
     self
   end
 
-  #def bind_append(seq, cmd=Proc.new, *args)
-  #  @c.itembind_append(@id, seq, cmd, *args)
-  #  self
-  #end
-  def bind_append(seq, *args)
+  def bind_append(seq, *args, &block)
     # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
+    if TkComm._callback_entry?(args[0]) || !block
       cmd = args.shift
     else
-      cmd = Proc.new
+      cmd = block
     end
     @c.itembind_append(@id, seq, cmd, *args)
     self
@@ -195,7 +187,7 @@ module TkcTagAccess
   #      ltag = tag1 | tag2; ltag.path => "(t1)||(t2)"
   #      ltag = tag1 ^ tag2; ltag.path => "(t1)^(t2)"
   #      ltag = - tag1;      ltag.path => "!(t1)"
-  def & (tag)
+  def &(tag)
     if tag.kind_of? TkObject
       TkcTagString.new(@c, '(' + @id + ')&&(' + tag.path + ')')
     else
@@ -203,7 +195,7 @@ module TkcTagAccess
     end
   end
 
-  def | (tag)
+  def |(tag)
     if tag.kind_of? TkObject
       TkcTagString.new(@c, '(' + @id + ')||(' + tag.path + ')')
     else
@@ -211,7 +203,7 @@ module TkcTagAccess
     end
   end
 
-  def ^ (tag)
+  def ^(tag)
     if tag.kind_of? TkObject
       TkcTagString.new(@c, '(' + @id + ')^(' + tag.path + ')')
     else
@@ -229,7 +221,7 @@ class TkcTag<TkObject
 
   CTagID_TBL = TkCore::INTERP.create_table
 
-  (Tk_CanvasTag_ID = ['ctag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (Tk_CanvasTag_ID = ['ctag'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze
@@ -415,7 +407,7 @@ class TkcTagCurrent<TkcTagString
 end
 
 class TkcGroup<TkcTag
-  (Tk_cGroup_ID = ['tkcg'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (Tk_cGroup_ID = ['tkcg'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze

data/lib/tk/entry.rb

@@ -96,7 +96,7 @@ class Tk::Entry<Tk::Label
   def value
     _fromUTF8(tk_send_without_enc('get'))
   end
-  def value= (val)
+  def value=(val)
     tk_send_without_enc('delete', 0, 'end')
     tk_send_without_enc('insert', 0, _get_eval_enc_str(val))
     val

data/lib/tk/font.rb

@@ -12,7 +12,7 @@ class TkFont
 
   TkCommandNames = ['font'.freeze].freeze
 
-  (Tk_FontID = ["@font".freeze, TkUtil.untrust("00000")]).instance_eval{
+  (Tk_FontID = ["@font".freeze, "00000"]).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze

data/lib/tk/fontchooser.rb

@@ -109,7 +109,7 @@ class << TkFont::Chooser
     if cmd
       configure_cmd('command', cmd)
     elsif b
-      configure_cmd('command', Proc.new(&b))
+      configure_cmd('command', b)
     else
       cget('command')
     end

data/lib/tk/grid.rb

@@ -66,15 +66,15 @@ module TkGrid
     params = []
     args.flatten(1).each{|win|
       case win
-      when '-', ?-              # RELATIVE PLACEMENT (increase columnspan)
+      when '-', ?-.ord              # RELATIVE PLACEMENT (increase columnspan)
         params.push('-')
       when /^-+$/             # RELATIVE PLACEMENT (increase columnspan)
         params.concat(win.to_s.split(//))
-      when '^', ?^              # RELATIVE PLACEMENT (increase rowspan)
+      when '^', ?^.ord              # RELATIVE PLACEMENT (increase rowspan)
         params.push('^')
       when /^\^+$/             # RELATIVE PLACEMENT (increase rowspan)
         params.concat(win.to_s.split(//))
-      when 'x', :x, ?x, nil, '' # RELATIVE PLACEMENT (empty column)
+      when 'x', :x, ?x.ord, nil, '' # RELATIVE PLACEMENT (empty column)
         params.push('x')
       when /^x+$/             # RELATIVE PLACEMENT (empty column)
         params.concat(win.to_s.split(//))
@@ -243,7 +243,7 @@ module TkGrid
     list(tk_call_without_enc('grid', 'size', master))
   end
 
-  def slaves(master, keys=nil)
+  def slaves(master, args=nil)
     # master = master.epath if master.kind_of?(TkObject)
     master = _epath(master)
     list(tk_call_without_enc('grid', 'slaves', master, *hash_kv(args)))

data/lib/tk/image.rb

@@ -12,7 +12,7 @@ class TkImage<TkObject
 
   Tk_IMGTBL = TkCore::INTERP.create_table
 
-  (Tk_Image_ID = ['i'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (Tk_Image_ID = ['i'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze

data/lib/tk/itemconfig.rb

@@ -177,7 +177,7 @@ module TkItemConfigMethod
       fail ArgumentError, "Invalid option `#{orig_opt.inspect}'"
     end
 
-    alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == option}
+    _, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == option}
     if real_name
       option = real_name.to_s
     end
@@ -324,7 +324,7 @@ module TkItemConfigMethod
         fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
       end
 
-      alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
+      _, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
       if real_name
         slot = real_name.to_s
       end
@@ -429,7 +429,7 @@ module TkItemConfigMethod
         if slot
           slot = slot.to_s
 
-          alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
+          _, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
           if real_name
             slot = real_name.to_s
           end
@@ -806,7 +806,7 @@ module TkItemConfigMethod
         if slot
           slot = slot.to_s
 
-          alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
+          _, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
           if real_name
             slot = real_name.to_s
           end

data/lib/tk/itemfont.rb

@@ -101,7 +101,7 @@ module TkTreatItemFont
               else
                 begin
                   tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << fnt))
-                rescue => e
+                rescue
                   # ignore
                 end
               end
@@ -163,7 +163,7 @@ module TkTreatItemFont
         else
           begin
             tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << ltn))
-          rescue => e
+          rescue
             # ignore
           end
         end
@@ -223,7 +223,7 @@ module TkTreatItemFont
         else
           begin
             tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << knj))
-          rescue => e
+          rescue
             # ignore
           end
         end

data/lib/tk/listbox.rb

@@ -88,7 +88,7 @@ class Tk::Listbox<TkTextWin
     get('0', 'end')
   end
 
-  def value= (vals)
+  def value=(vals)
     unless vals.kind_of?(Array)
       fail ArgumentError, 'an Array is expected'
     end

data/lib/tk/menu.rb

@@ -186,16 +186,16 @@ class Tk::Menu<TkWindow
     tk_send_without_enc('postcascade', _get_eval_enc_str(index))
     self
   end
-  def postcommand(cmd=Proc.new)
-    configure_cmd 'postcommand', cmd
+  def postcommand(cmd=nil, &block)
+    configure_cmd('postcommand', cmd || block)
     self
   end
   def set_focus
     tk_call_without_enc('tk_menuSetFocus', path)
     self
   end
-  def tearoffcommand(cmd=Proc.new)
-    configure_cmd 'tearoffcommand', cmd
+  def tearoffcommand(cmd=nil, &block)
+    configure_cmd('tearoffcommand', cmd || block)
     self
   end
   def menutype(index)

data/lib/tk/menuspec.rb

@@ -210,7 +210,6 @@ module TkMenuSpec
   private :_create_menu
 
   def _use_menubar?(parent)
-    use_menubar = false
     if parent.kind_of?(Tk::Root) || parent.kind_of?(Tk::Toplevel)
       true
     elsif parent.current_configinfo.has_key?('menu')

data/lib/tk/msgcat.rb

@@ -37,7 +37,7 @@ class TkMsgCatalog < TkObject
 
   MSGCAT_EXT = '.msg'
 
-  UNKNOWN_CBTBL = TkUtil.untrust(Hash.new{|hash,key| hash[key] = {}})
+  UNKNOWN_CBTBL = Hash.new{|hash,key| hash[key] = {}}
 
   TkCore::INTERP.add_tk_procs('::msgcat::mcunknown', 'args', <<-'EOL')
     if {[set st [catch {eval {ruby_cmd TkMsgCatalog callback} [namespace current] $args} ret]] != 0} {
@@ -289,11 +289,11 @@ class TkMsgCatalog < TkObject
            })
   end
 
-  def self.def_unknown_proc(cmd=Proc.new)
-    TkMsgCatalog::UNKNOWN_CBTBL[TkCore::INTERP.__getip]['::'] = cmd
+  def self.def_unknown_proc(cmd=nil, &block)
+    TkMsgCatalog::UNKNOWN_CBTBL[TkCore::INTERP.__getip]['::'] = cmd || block
   end
-  def def_unknown_proc(cmd=Proc.new)
-    TkMsgCatalog::UNKNOWN_CBTBL[TkCore::INTERP.__getip][@namespace.path] = cmd
+  def def_unknown_proc(cmd=nil, &block)
+    TkMsgCatalog::UNKNOWN_CBTBL[TkCore::INTERP.__getip][@namespace.path] = cmd || block
   end
 end
 

data/lib/tk/namespace.rb

@@ -14,7 +14,7 @@ class TkNamespace < TkObject
 
   Tk_Namespace_ID_TBL = TkCore::INTERP.create_table
 
-  (Tk_Namespace_ID = ["ns".freeze, TkUtil.untrust("00000")]).instance_eval{
+  (Tk_Namespace_ID = ["ns".freeze, "00000"]).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze
@@ -257,7 +257,7 @@ class TkNamespace < TkObject
         if name =~ /^::/
           @fullname = parent + name
         else
-          @fullname = parent +'::'+ name
+          @fullname = parent + '::' + name
         end
       else
         ancestor = __tk_call('namespace', 'current')
@@ -265,7 +265,7 @@ class TkNamespace < TkObject
         if name =~ /^::/
           @fullname = ancestor + '::' + parent + name
         else
-          @fullname = ancestor + '::'+ parent +'::'+ name
+          @fullname = ancestor + '::' + parent + '::' + name
         end
       end
     else # parent == nil
@@ -307,23 +307,12 @@ class TkNamespace < TkObject
     TkNamespace.children(@fullname, pattern)
   end
 
-  def self.code(script = Proc.new)
-    TkNamespace.new('').code(script)
+  def self.code(script = nil, &block)
+    TkNamespace.new('').code(script || block)
   end
-=begin
-  def code(script = Proc.new)
-    if script.kind_of?(String)
-      cmd = proc{|*args| ScopeArgs.new(@fullname,*args).instance_eval(script)}
-    elsif script.kind_of?(Proc)
-      cmd = proc{|*args| ScopeArgs.new(@fullname,*args).instance_eval(&script)}
-    else
-      fail ArgumentError, "String or Proc is expected"
-    end
-    TkNamespace::NsCode.new(tk_call_without_enc('namespace', 'code',
-                                                _get_eval_string(cmd, false)))
-  end
-=end
-  def code(script = Proc.new)
+
+  def code(script = nil, &block)
+    script ||= block
     if script.kind_of?(String)
       cmd = proc{|*args|
         ret = ScopeArgs.new(@fullname,*args).instance_eval(script)
@@ -414,22 +403,13 @@ class TkNamespace < TkObject
     bool(tk_call('namespace', 'ensemble', 'exists', cmd))
   end
 
-  def self.eval(namespace, cmd = Proc.new, *args)
+  def self.eval(namespace, cmd = nil, *args, &block)
+    cmd ||= block
     #tk_call('namespace', 'eval', namespace, cmd, *args)
     TkNamespace.new(namespace).eval(cmd, *args)
   end
-=begin
-  def eval(cmd = Proc.new, *args)
-    #TkNamespace.eval(@fullname, cmd, *args)
-    #ns_tk_call(cmd, *args)
-    code_obj = code(cmd)
-    ret = code_obj.call(*args)
-    # uninstall_cmd(TkCore::INTERP._split_tklist(code_obj.path)[-1])
-    uninstall_cmd(_fromUTF8(TkCore::INTERP._split_tklist(_toUTF8(code_obj.path))[-1]))
-    tk_tcl2ruby(ret)
-  end
-=end
-  def eval(cmd = Proc.new, *args)
+  def eval(cmd = nil, *args, &block)
+    cmd ||= block
     code_obj = code(cmd)
     ret = code_obj.call(*args)
     uninstall_cmd(_fromUTF8(TkCore::INTERP._split_tklist(_toUTF8(code_obj.path))[-1]))
@@ -529,8 +509,8 @@ class TkNamespace < TkObject
   def self.get_unknown_handler
     tk_tcl2ruby(tk_call('namespace', 'unknown'))
   end
-  def self.set_unknown_handler(cmd = Proc.new)
-    tk_call('namespace', 'unknown', cmd)
+  def self.set_unknown_handler(cmd = nil, &block)
+    tk_call('namespace', 'unknown', cmd || block)
   end
 
   def self.which(name)